diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-01-12 04:07:16 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2015-01-12 04:07:16 +0100 |
| commit | 24d693348a6022d4434104be69c05a79621f5731 (patch) | |
| tree | c7d442d9df5b3b6230f3caead496bebfacfa3e6b | |
| parent | ce69208641e7d1f84336ba3468899ba8d5f68112 (diff) | |
| download | plan9front-24d693348a6022d4434104be69c05a79621f5731.tar.xz | |
igfx: reverting previous change, pci id is for the second graphics controller pci device
| -rw-r--r-- | lib/vgadb | 8 | ||||
| -rw-r--r-- | sys/src/9/pc/vgaigfx.c | 5 | ||||
| -rw-r--r-- | sys/src/cmd/aux/vga/igfx.c | 1 |
3 files changed, 3 insertions, 11 deletions
@@ -436,7 +436,6 @@ ctlr ctlr vid=0x8086 did=0x0166 # X230 - vid=0x8086 did=0x2a43 # X200 vid=0x8086 did=0x2a42 # X200s link=vga hwgc=igfxhwgc @@ -1700,18 +1699,15 @@ x230=1366x768 # 60Hz lcd=1 # -# Lenovo X200 (LCD) LVDS +# Lenovo X200s (LCD) LVDS # -x200=1280x800 # 60Hz +x200s=1280x800 # 60Hz clock=75 shb=1296 ehb=1344 ht=1512 vrs=802 vre=804 vt=830 hsync=- vsync=- lcd=1 -x200s - alias=x200 - # # LG Flatron L1730P # diff --git a/sys/src/9/pc/vgaigfx.c b/sys/src/9/pc/vgaigfx.c index 4dd6e4087..f95bc3a01 100644 --- a/sys/src/9/pc/vgaigfx.c +++ b/sys/src/9/pc/vgaigfx.c @@ -84,10 +84,7 @@ igfxcurregs(VGAscr* scr, int pipe) /* check PIPExCONF if enabled */ if((scr->mmio[(0x70008 | o)/4] & (1<<31)) == 0) return nil; - switch(scr->pci->did){ - case 0x2a42: /* X200 */ - case 0x2a43: /* X200s */ - /* G45 */ + if(scr->pci->did == 0x2a42){ /* G45 */ if(pipe > 1) return nil; o = pipe*0x40; diff --git a/sys/src/cmd/aux/vga/igfx.c b/sys/src/cmd/aux/vga/igfx.c index 15c17c9a6..9d972b148 100644 --- a/sys/src/cmd/aux/vga/igfx.c +++ b/sys/src/cmd/aux/vga/igfx.c @@ -305,7 +305,6 @@ devtype(Igfx *igfx) case 0x0166: /* X230 */ return TypeIVB; - case 0x2a43: /* X200 */ case 0x2a42: /* X200s */ return TypeG45; } |