rpms/xorg-x11-drv-i810/devel intel-2.1.1-quirk-update.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.63, 1.64

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9493

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-quirk-update.patch 
Log Message:
* Fri Oct 05 2007 Dave Airlie <airlied at redhat.com> 2.1.1-4
- intel-2.1.1-quirk-update.patch - update quirks from master


intel-2.1.1-quirk-update.patch:

--- NEW FILE intel-2.1.1-quirk-update.patch ---
--- xf86-video-intel-2.1.1/src/i830_quirks.c.orig	2007-08-14 14:58:29.000000000 +1000
+++ xf86-video-intel-2.1.1/src/i830_quirks.c	2007-10-02 15:01:30.000000000 +1000
@@ -54,17 +54,31 @@
     pI830->quirk_flag |= QUIRK_IGNORE_MACMINI_LVDS;
 }
 
+/* keep this list sorted by OEM, then by chip ID */
 static i830_quirk i830_quirk_list[] = {
+    /* Aopen mini pc */
+    { PCI_CHIP_I945_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
+    
+    /* Apple Mac mini has no lvds, but macbook pro does */
+    { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
+    
+    /* Dell Latitude X1 */
+    { PCI_CHIP_I945_GM, 0x1028, 0x01a3, quirk_ignore_tv },
+    /* Dell XPS 1330 */
+    { PCI_CHIP_I965_GM, 0x1028, 0x0209, quirk_ignore_tv },
+    
+    /* Lenovo X60s has no TV output */
+    { PCI_CHIP_I945_GM, 0x17aa, 0x201a, quirk_ignore_tv },
     /* Lenovo T61 has no TV output */
     { PCI_CHIP_I965_GM, 0x17aa, 0x20b5, quirk_ignore_tv },
-    /* Panasonic Toughbook CF-Y4 has no TV output */
-    { PCI_CHIP_I915_GM, 0x10f7, 0x8338, quirk_ignore_tv },
     /* Lenovo 3000 v200 */
     { PCI_CHIP_I965_GM, 0x17aa, 0x3c18, quirk_ignore_tv },
-    /* Aopen mini pc */
-    { PCI_CHIP_I945_GM, 0xa0a0, SUBSYS_ANY, quirk_ignore_lvds },
-    /* Mac mini has no lvds, but macbook pro does */
-    { PCI_CHIP_I945_GM, 0x8086, 0x7270, quirk_mac_mini },
+    
+    /* Panasonic Toughbook CF-Y4 has no TV output */
+    { PCI_CHIP_I915_GM, 0x10f7, 0x8338, quirk_ignore_tv },
+    /* Panasonic Toughbook CF-Y7 has no TV output */
+    { PCI_CHIP_I965_GM, 0x10f7, 0x8338, quirk_ignore_tv },
+    
     { 0, 0, 0, NULL },
 };
 


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- xorg-x11-drv-i810.spec	20 Aug 2007 20:45:41 -0000	1.63
+++ xorg-x11-drv-i810.spec	5 Oct 2007 01:25:16 -0000	1.64
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 i810 video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.1.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 
 # new school intel driver patches
 Patch0: intel-2.1.1-fix-texoffset-start.patch
+Patch1: intel-2.1.1-quirk-update.patch
 
 # legacy i810 driver patches
 Patch100: i810-1.6.5-to-git-20060911.patch
@@ -63,6 +64,7 @@
 cd xf86-video-intel-%{version}
 
 %patch0 -p1 -b .texoffsetstart
+%patch1 -p1 -b .quirk-update
 
 %build
 OPTS="--disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri"
@@ -105,6 +107,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Fri Oct 05 2007 Dave Airlie <airlied at redhat.com> 2.1.1-4
+- intel-2.1.1-quirk-update.patch - update quirks from master
+
 * Mon Aug 20 2007 Adam Jackson <ajax at redhat.com> 2.1.1-3
 - i810.xinf: Flip everything over to -intel by default now.  Still install
   i810 driver just in case.