.29 patch

diff --git a/queue-2.6.29/drm-i915-add-support-for-g41-chipset.patch b/queue-2.6.29/drm-i915-add-support-for-g41-chipset.patch
new file mode 100644 (file)
index 0000000..0299c79
--- /dev/null
+++ b/queue-2.6.29/drm-i915-add-support-for-g41-chipset.patch
@@ -0,0 +1,51 @@
+From 72021788678523047161e97b3dfed695e802a5fd Mon Sep 17 00:00:00 2001
+From: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Mon, 17 Nov 2008 13:58:11 +0800
+Subject: drm/i915: add support for G41 chipset
+
+From: Zhenyu Wang <zhenyu.z.wang@intel.com>
+
+commit 72021788678523047161e97b3dfed695e802a5fd upstream.
+
+This had been delayed for some time due to failure to work on the one piece
+of G41 hardware we had, and lack of success reports from anybody else.
+Current hardware appears to be OK.
+
+Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
+[anholt: hand-applied due to conflicts with IGD patches]
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/i915/i915_drv.h |    4 +++-
+ include/drm/drm_pciids.h        |    1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -773,7 +773,8 @@ extern int i915_wait_ring(struct drm_dev
+                      (dev)->pci_device == 0x2A42 || \
+                      (dev)->pci_device == 0x2E02 || \
+                      (dev)->pci_device == 0x2E12 || \
+-                     (dev)->pci_device == 0x2E22)
++                     (dev)->pci_device == 0x2E22 || \
++                     (dev)->pci_device == 0x2E32)
+ 
+ #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
+ 
+@@ -782,6 +783,7 @@ extern int i915_wait_ring(struct drm_dev
+ #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
+                    (dev)->pci_device == 0x2E12 || \
+                    (dev)->pci_device == 0x2E22 || \
++                   (dev)->pci_device == 0x2E32 || \
+                    IS_GM45(dev))
+ 
+ #define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||        \
+--- a/include/drm/drm_pciids.h
++++ b/include/drm/drm_pciids.h
+@@ -418,4 +418,5 @@
+       {0x8086, 0x2e02, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+       {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+       {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
++      {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
+       {0, 0, 0}

diff --git a/queue-2.6.29/series b/queue-2.6.29/series
index 7a2079832d69ac1c258fb027a8a05dc194f00aa6..75490bf5b22a063b159e086c349e65e184a580e0 100644 (file)
--- a/queue-2.6.29/series
+++ b/queue-2.6.29/series
@@ -17,3 +17,4 @@ crypto-ixp4xx-fix-handling-of-chained-sg-buffers.patch
 exit_notify-kill-the-wrong-capable-check.patch
 pci-fix-incorrect-mask-of-pm-no_soft_reset-bit.patch
 unreached-code-in-selinux_ip_postroute_iptables_compat.patch
+drm-i915-add-support-for-g41-chipset.patch