another .25 patch

diff --git a/queue-2.6.25/drm-enable-bus-mastering-on-i915-at-resume-time.patch b/queue-2.6.25/drm-enable-bus-mastering-on-i915-at-resume-time.patch
new file mode 100644 (file)
index 0000000..2439803
--- /dev/null
+++ b/queue-2.6.25/drm-enable-bus-mastering-on-i915-at-resume-time.patch
@@ -0,0 +1,33 @@
+From ea7b44c8e6baa1a4507f05ba2c0009ac21c3fe0b Mon Sep 17 00:00:00 2001
+From: Jie Luo <clotho67@gmail.com>
+Date: Tue, 24 Jun 2008 10:38:31 -0700
+Subject: DRM: enable bus mastering on i915 at resume time
+Message-ID: <alpine.LFD.1.10.0806241119100.2926@woody.linux-foundation.org>
+
+From: Jie Luo <clotho67@gmail.com>
+
+commit ea7b44c8e6baa1a4507f05ba2c0009ac21c3fe0b upstream
+
+On 9xx chips, bus mastering needs to be enabled at resume time for much of the
+chip to function.  With this patch, vblank interrupts will work as expected
+on resume, along with other chip functions.   Fixes kernel bugzilla #10844.
+
+Signed-off-by: Jie Luo <clotho67@gmail.com>
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/drm/i915_drv.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/char/drm/i915_drv.c
++++ b/drivers/char/drm/i915_drv.c
+@@ -385,6 +385,7 @@ static int i915_resume(struct drm_device
+       pci_restore_state(dev->pdev);
+       if (pci_enable_device(dev->pdev))
+               return -1;
++      pci_set_master(dev->pdev);
+ 
+       pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
+ 

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index 764e4d9a0e57c8f887fd0490ef8410e248e437ce..0fba041888835991146bb22f7096fa2436d55770 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -2,3 +2,4 @@ tty-fix-for-tty-operations-bugs.patch
 xen-mask-unwanted-pte-bits-in-__supported_pte_mask.patch
 futexes-fix-fault-handling-in-futex_lock_pi.patch
 ib-mthca-clear-icm-pages-before-handing-to-fw.patch
+drm-enable-bus-mastering-on-i915-at-resume-time.patch