summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2009-09-14 04:47:07 +0200
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-09-17 23:43:33 +0200
commitb7e53aba2f0e6abf23e3f07b38b241145c33a005 (patch)
tree8fee47bd3e4b06ca876124c5a917e3eab068cd2c /drivers/gpu
parentdrm/i915: Improve behaviour under memory pressure (diff)
downloadlinux-b7e53aba2f0e6abf23e3f07b38b241145c33a005.tar.xz
linux-b7e53aba2f0e6abf23e3f07b38b241145c33a005.zip
drm/i915: remove restore in resume
Don't need extra config restore like for intel_agp, which might cause resume hang issue found by Alan on 845G. Cc: Stable Team <stable@kernel.org> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index c57c1744cecf..b93814c0d3e2 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -99,8 +99,6 @@ static int i915_resume(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;
int ret = 0;
- pci_set_power_state(dev->pdev, PCI_D0);
- pci_restore_state(dev->pdev);
if (pci_enable_device(dev->pdev))
return -1;
pci_set_master(dev->pdev);