vgadb: move nvidia controller entry after igfx and add haswell dids

[plan9front.git] / lib / vgadb

diff --git a/lib/vgadb b/lib/vgadb
index 5b9e8323ad8b3e34b5710c4fdc2205449450fd9f..3163fea07d92674b96674986287779ef6f41b93b 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,9 +430,10 @@ ctlr
        ctlr=geode linear=1
 
 ctlr
-       vid=0x8086 did=0x0126   # Intel 2nd Gen Core
        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
@@ -447,6 +443,11 @@ ctlr
        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:
@@ -1695,16 +1696,6 @@ s2231wD=1680x1050
        vrs=1053 vre=1059 vt=1080
        hsync=+ vsync=-
 
-#
-# Lenovo T420 (LCD) LVDS
-#
-#t420=1366x768         # 60Hz
-#      clock=69.3
-#      shb=1398 ehb=1430 ht=1470
-#      vrs=771 vre=776 vt=786
-#      hsync=- vsync=- 
-#      lcd=1
-
 #
 # Lenovo X230 (LCD) LVDS
 #
@@ -1838,3 +1829,14 @@ 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=-