merge

[plan9front.git] / lib / vgadb

diff --git a/lib/vgadb b/lib/vgadb
index 2b57866834a7e3ea109dc226fbab55ec0a200862..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,12 +430,29 @@ ctlr
        ctlr=geode linear=1
 
 ctlr
-       vid=0x8086 did=0x0166   # X230
-       vid=0x8086 did=0x2a42   # X200s
+       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=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:
 # These entries specify a monitor operating mode.
@@ -1699,11 +1711,146 @@ x230=1366x768          # 60Hz
        lcd=1
 
 #
-# Lenovo X200s (LCD) LVDS
+# Lenovo ThinkPad X200 (LCD) LVDS
 #
-x200s=1280x800         # 60Hz
+x200=1280x800          # 60Hz
        clock=75
        shb=1296 ehb=1344 ht=1512
        vrs=802 vre=804 vt=830
        hsync=- vsync=-
        lcd=1
+
+x200s
+       alias=x200
+
+#
+# Lenovo ThinkPad X301 (LCD) LVDS
+#
+x301=1440x900          # 60Hz
+       clock=102
+       shb=1488 ehb=1520 ht=1836
+       vrs=903 vre=909 vt=926
+       hsync=- vsync=-
+       lcd=1
+
+#
+# LG Flatron L1730P
+#
+l1730p=1280x1024               # 60Hz
+       clock=108
+       shb=1320 ehb=1440 ht=1688
+       vrs=1025 vre=1028 vt=1066
+       hsync=+ vsync=+
+
+#
+# Lenovo ThinkPad X60 Tablet (LCD) LVDS
+#
+x60t=640x480           # 60Hz   
+       clock=25.175
+       shb=648 ehb=792 ht=800
+       vrs=490 vre=492 vt=525
+       hsync=- vsync=-
+       lcd=1
+x60t=800x600           # 60Hz   
+       clock=40
+       shb=800 ehb=1056 ht=1056
+       vrs=601 vre=605 vt=628
+       hsync=+ vsync=+
+       lcd=1
+x60t=1024x768          # 60Hz  
+       clock=65
+       shb=1024 ehb=1344 ht=1344
+       vrs=771 vre=777 vt=806
+       hsync=- vsync=-
+       lcd=1
+x60t=1400x1050         # 50Hz
+       clock=84.8
+       shb=1420 ehb=1536 ht=1600
+       vrs=1052 vre=1057 vt=1060
+       hsync=- vsync=-
+       lcd=1
+
+#
+# NEC LCD2190uXp
+#
+lcd2190uxp=640x480             # 60Hz   
+       clock=25.175
+       shb=648 ehb=792 ht=800
+       vrs=490 vre=492 vt=525
+       hsync=- vsync=- 
+lcd2190uxp=640x480             # 73Hz   
+       clock=31.5
+       shb=648 ehb=824 ht=832
+       vrs=489 vre=492 vt=520
+       hsync=- vsync=- 
+lcd2190uxp=640x480             # 75Hz   
+       clock=31.5
+       shb=640 ehb=840 ht=840
+       vrs=481 vre=484 vt=500
+       hsync=- vsync=- 
+lcd2190uxp=800x600             # 56Hz   
+       clock=36
+       shb=800 ehb=1024 ht=1024
+       vrs=601 vre=603 vt=625
+       hsync=+ vsync=+ 
+lcd2190uxp=800x600             # 60Hz   
+       clock=40
+       shb=800 ehb=1056 ht=1056
+       vrs=601 vre=605 vt=628
+       hsync=+ vsync=+ 
+lcd2190uxp=800x600             # 72Hz   
+       clock=50
+       shb=800 ehb=1040 ht=1040
+       vrs=637 vre=643 vt=666
+       hsync=+ vsync=+ 
+lcd2190uxp=800x600             # 75Hz   
+       clock=49.5
+       shb=800 ehb=1056 ht=1056
+       vrs=601 vre=604 vt=625
+       hsync=+ vsync=+ 
+lcd2190uxp=1024x768            # 60Hz  
+       clock=65
+       shb=1024 ehb=1344 ht=1344
+       vrs=771 vre=777 vt=806
+       hsync=- vsync=- 
+lcd2190uxp=1024x768            # 70Hz  
+       clock=75
+       shb=1024 ehb=1328 ht=1328
+       vrs=771 vre=777 vt=806
+       hsync=- vsync=- 
+lcd2190uxp=1024x768            # 75Hz  
+       clock=78.75
+       shb=1024 ehb=1312 ht=1312
+       vrs=769 vre=772 vt=800
+       hsync=+ vsync=+ 
+lcd2190uxp=1280x1024           # 75Hz 
+       clock=135
+       shb=1280 ehb=1688 ht=1688
+       vrs=1025 vre=1028 vt=1066
+       hsync=+ vsync=+ 
+lcd2190uxp=1600x1200           # 60Hz 
+       clock=162
+       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=+