merge

[plan9front.git] / lib / vgadb

diff --git a/lib/vgadb b/lib/vgadb
index 98498a2be7ca638555778e38ccfb57e9bf4d46ab..dadc5ee55a2d5ac0330cb74f80a0441343065c9e 100644 (file)
--- a/lib/vgadb
+++ b/lib/vgadb
@@ -367,11 +367,6 @@ ctlr
        link=vga
        ctlr=3dfx linear=1
        hwgc=3dfxhwgc
-ctlr
-       vid=0x10DE did=*                        # NVidia cards all talk the same
-       link=vga
-       ctlr=nvidia linear=1
-       hwgc=nvidiahwgc
 
 ctlr
        vid=0x15AD did=0x0710           # VMware 1
@@ -435,16 +430,28 @@ ctlr
        ctlr=geode linear=1
 
 ctlr
-       vid=0x8086 did=0x0166   # X230
-       vid=0x8086 did=0x2a42   # X200
+       vid=0x8086 did=0x0046   # Intel Ironlake Arrandale
+       vid=0x8086 did=0x0102   # Intel 2nd Gen Core (HD 2000)
+       vid=0x8086 did=0x0126   # Intel 2nd Gen Core (HD 3000)
+       vid=0x8086 did=0x0166   # Intel 3rd Gen Core
+       vid=0x8086 did=0x2a42   # Intel 4 Series Mobile
+       vid=0x8086 did=0x0a16   # Intel 4th Gen Core (HD 4400)
+       vid=0x8086 did=0x0412   # Intel 4th Gen Core (HD 4600)
        link=vga
        hwgc=igfxhwgc
        ctlr=igfx linear=1
 
 ctlr
-       vid=0x8086 did=0x27a2   # X60 Tablet (hardware cursor broken)
+       vid=0x8086 did=0x2592   # Intel 915GM
+       vid=0x8086 did=0x27a2   # Intel GM945/82940GML (hardware cursor broken)
+       vid=0x8086 did=0x2a02   # Intel GM965/GL960/X3100 (hardware cursor broken)
        link=vga
        ctlr=igfx linear=1
+ctlr
+       vid=0x10DE did=*                        # NVidia cards all talk the same
+       link=vga
+       ctlr=nvidia linear=1
+       hwgc=nvidiahwgc
 
 #
 # mode:
@@ -1704,7 +1711,7 @@ x230=1366x768             # 60Hz
        lcd=1
 
 #
-# Lenovo X200 (LCD) LVDS
+# Lenovo ThinkPad X200 (LCD) LVDS
 #
 x200=1280x800          # 60Hz
        clock=75
@@ -1717,7 +1724,7 @@ x200s
        alias=x200
 
 #
-# Lenovo X301 (LCD) LVDS
+# Lenovo ThinkPad X301 (LCD) LVDS
 #
 x301=1440x900          # 60Hz
        clock=102
@@ -1736,7 +1743,7 @@ l1730p=1280x1024          # 60Hz
        hsync=+ vsync=+
 
 #
-# Lenovo Thinkpad X60 Tablet (LCD) LVDS
+# Lenovo ThinkPad X60 Tablet (LCD) LVDS
 #
 x60t=640x480           # 60Hz   
        clock=25.175
@@ -1826,3 +1833,24 @@ lcd2190uxp=1600x1200             # 60Hz
        shb=1664 ehb=1856 ht=2160
        vrs=1201 vre=1204 vt=1250
        hsync=+ vsync=+
+
+#
+# Panasonic CF-R7 LCD panel
+#
+cfr7=1024x768
+       lcd=1
+       defaultclock=75
+       shb=1096 ehb=1232 ht=1344
+       shs=1072
+       vrs=771 vre=777 vt=806
+       hsync=- vsync=-
+
+#
+# IBM Thinkpad T43p
+#
+t43p=1600x1200
+       lcd=1
+       defaultclock=162
+       shb=1664 ehb=1856 ht=2160
+       vrs=1201 vre=1204 vt=1250
+       hsync=+ vsync=+