summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJie Luo <clotho67@gmail.com>2008-06-24 21:38:31 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-03 07:46:15 +0400
commit20dc9a897a736105af739346fd6517dec6142b5d (patch)
treeb7da071b7679364c18b18120227c04aaa64d2145
parent6f139f638a58706d45e1219e7625ec39608115b2 (diff)
downloadlinux-sunxi-20dc9a897a736105af739346fd6517dec6142b5d.tar.xz
DRM: enable bus mastering on i915 at resume time
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>
-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 b2b451dc4460..becab51d0e30 100644
--- 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 *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);