summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJie Luo <clotho67@gmail.com>2008-06-24 10:38:31 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-07-01 12:22:54 -0700
commite935925cd733fffef44b3e3210a875b57b3812e9 (patch)
tree8b0e3704e1b55ea6217bcf548f03339afbf15226 /linux-core
parent5d27fd94afaaf434c3a92af0075420b550055bfb (diff)
i915: 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>
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i915_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/i915_drv.c b/linux-core/i915_drv.c
index a1964f40..be25239d 100644
--- a/linux-core/i915_drv.c
+++ b/linux-core/i915_drv.c
@@ -95,6 +95,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);
i915_restore_state(dev);