From 6fe180657f3a7a17801cb9aa36c8fe9abda34ac7 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Fri, 9 Jan 2015 02:55:12 +0100
Subject: [PATCH] igfx: work in progress intel graphics driver

this driver can modeset lvds on x200s and x230.
everything else is completely untested.
no hardware cursor implemented.
no vgadb entries are provided.
---
 sys/src/9/pc/pccpuf        | 1 +
 sys/src/9/pc/pcf           | 1 +
 sys/src/9/pc64/pc64        | 1 +
 sys/src/cmd/aux/vga/data.c | 1 +
 sys/src/cmd/aux/vga/mkfile | 4 +++-
 sys/src/cmd/aux/vga/vga.h  | 4 +++-
 6 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys/src/9/pc/pccpuf b/sys/src/9/pc/pccpuf
index 98c852e1f..89d726b8c 100644
--- a/sys/src/9/pc/pccpuf
+++ b/sys/src/9/pc/pccpuf
@@ -113,6 +113,7 @@ misc
 	vgageode	+cur
 	vgahiqvideo	+cur
 	vgai81x		+cur
+	vgaigfx
 	vgamach64xx	+cur
 	vgamga2164w	+cur
 	vgamga4xx	+cur
diff --git a/sys/src/9/pc/pcf b/sys/src/9/pc/pcf
index 00de2cd0a..f4166027d 100644
--- a/sys/src/9/pc/pcf
+++ b/sys/src/9/pc/pcf
@@ -114,6 +114,7 @@ misc
 	vgageode	+cur
 	vgahiqvideo	+cur
 	vgai81x		+cur
+	vgaigfx
 	vgamach64xx	+cur
 	vgamga2164w	+cur
 	vgamga4xx	+cur
diff --git a/sys/src/9/pc64/pc64 b/sys/src/9/pc64/pc64
index 9270ac820..f61c10beb 100644
--- a/sys/src/9/pc64/pc64
+++ b/sys/src/9/pc64/pc64
@@ -124,6 +124,7 @@ misc
 #	vgatvp3020	=cur
 #	vgatvp3026	=cur
 	vgavesa
+	vgaigfx
 #	vgavmware	+cur
 
 ip
diff --git a/sys/src/cmd/aux/vga/data.c b/sys/src/cmd/aux/vga/data.c
index 1d97534eb..306a5c010 100644
--- a/sys/src/cmd/aux/vga/data.c
+++ b/sys/src/cmd/aux/vga/data.c
@@ -87,6 +87,7 @@ Ctlr* ctlrs[] = {
 	&w30c516,				/* ctlr */
 	&mga4xx,
 	&mga4xxhwgc,
+	&igfx,					/* ctlr */
 	0,
 };
 
diff --git a/sys/src/cmd/aux/vga/mkfile b/sys/src/cmd/aux/vga/mkfile
index ce05eed4f..cd57744b1 100644
--- a/sys/src/cmd/aux/vga/mkfile
+++ b/sys/src/cmd/aux/vga/mkfile
@@ -62,6 +62,7 @@ OFILES=\
 	vision968.$O\
 	vmware.$O\
 	w30c516.$O\
+	igfx.$O\
 
 HFILES=\
 	pci.h\
@@ -77,4 +78,5 @@ UPDATE=\
 
 </sys/src/cmd/mkone
 
-nvidia.$O:	riva_tbl.h
+geode.$O:	geode_modes.h
+radeon.$O:	radeon.h
diff --git a/sys/src/cmd/aux/vga/vga.h b/sys/src/cmd/aux/vga/vga.h
index b6b6a9d20..51efa2438 100644
--- a/sys/src/cmd/aux/vga/vga.h
+++ b/sys/src/cmd/aux/vga/vga.h
@@ -306,10 +306,12 @@ extern uvlong rdmsr(long);
 extern void wrmsr(long, uvlong);
 
 /* geode.c */
-
 extern Ctlr geode;
 extern Ctlr geodehwgc;
 
+/* igfx.c */
+extern Ctlr igfx;
+
 /* mach32.c */
 extern Ctlr mach32;