changelog shortlog tags branches files raw gz bz2 help

Mercurial > hg > plan9front / changeset: igfx: reverting previous change, pci id is for the second graphics controller pci device

changeset 4204: 0b82bae6d3f0
parent 4203: 0ee5a9547efd
child 4205: ddb8a41cde4f
author: cinap_lenrek@felloff.net
date: Mon, 12 Jan 2015 04:07:16 +0100
files: lib/vgadb sys/src/9/pc/vgaigfx.c sys/src/cmd/aux/vga/igfx.c
description: igfx: reverting previous change, pci id is for the second graphics controller pci device
     1.1--- a/lib/vgadb
     1.2+++ b/lib/vgadb
     1.3@@ -436,7 +436,6 @@ ctlr
     1.4 
     1.5 ctlr
     1.6 	vid=0x8086 did=0x0166	# X230
     1.7-	vid=0x8086 did=0x2a43	# X200
     1.8 	vid=0x8086 did=0x2a42	# X200s
     1.9 	link=vga
    1.10 	hwgc=igfxhwgc
    1.11@@ -1700,18 +1699,15 @@ x230=1366x768		# 60Hz
    1.12 	lcd=1
    1.13 
    1.14 #
    1.15-# Lenovo X200 (LCD) LVDS
    1.16+# Lenovo X200s (LCD) LVDS
    1.17 #
    1.18-x200=1280x800		# 60Hz
    1.19+x200s=1280x800		# 60Hz
    1.20 	clock=75
    1.21 	shb=1296 ehb=1344 ht=1512
    1.22 	vrs=802 vre=804 vt=830
    1.23 	hsync=- vsync=-
    1.24 	lcd=1
    1.25 
    1.26-x200s
    1.27-	alias=x200
    1.28-
    1.29 #
    1.30 # LG Flatron L1730P
    1.31 #
     2.1--- a/sys/src/9/pc/vgaigfx.c
     2.2+++ b/sys/src/9/pc/vgaigfx.c
     2.3@@ -84,10 +84,7 @@ igfxcurregs(VGAscr* scr, int pipe)
     2.4 	/* check PIPExCONF if enabled */
     2.5 	if((scr->mmio[(0x70008 | o)/4] & (1<<31)) == 0)
     2.6 		return nil;
     2.7-	switch(scr->pci->did){
     2.8-	case 0x2a42:	/* X200 */
     2.9-	case 0x2a43:	/* X200s */
    2.10-		/* G45 */
    2.11+	if(scr->pci->did == 0x2a42){	/* G45 */
    2.12 		if(pipe > 1)
    2.13 			return nil;
    2.14 		o = pipe*0x40;
     3.1--- a/sys/src/cmd/aux/vga/igfx.c
     3.2+++ b/sys/src/cmd/aux/vga/igfx.c
     3.3@@ -305,7 +305,6 @@ devtype(Igfx *igfx)
     3.4 	case 0x0166:	/* X230 */
     3.5 		return TypeIVB;
     3.6 
     3.7-	case 0x2a43:	/* X200 */
     3.8 	case 0x2a42:	/* X200s */
     3.9 		return TypeG45;
    3.10 	}