summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJie Luo <clotho67@gmail.com>2008-06-24 10:38:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-24 11:17:25 -0700
commitea7b44c8e6baa1a4507f05ba2c0009ac21c3fe0b (patch)
tree9f71bb94b0fab4c258505073c5cdd9b7cd11b34c
parent72c6e251ed84b3a9cdfde6711191155c47bb2b9c (diff)
enable bus mastering on i915 at resume time
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>
-rw-r--r--drivers/char/drm/i915_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index e8f3d682e3b1..93aed1c38bd2 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -389,6 +389,7 @@ static int i915_resume(struct drm_device *dev)
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);