diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-09-13 22:47:07 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-17 17:43:33 -0400 |
commit | b7e53aba2f0e6abf23e3f07b38b241145c33a005 (patch) | |
tree | 8fee47bd3e4b06ca876124c5a917e3eab068cd2c /drivers/gpu | |
parent | 07f73f6912667621276b002e33844ef283d98203 (diff) |
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.c | 2 |
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) | |||
99 | struct drm_i915_private *dev_priv = dev->dev_private; | 99 | struct drm_i915_private *dev_priv = dev->dev_private; |
100 | int ret = 0; | 100 | int ret = 0; |
101 | 101 | ||
102 | pci_set_power_state(dev->pdev, PCI_D0); | ||
103 | pci_restore_state(dev->pdev); | ||
104 | if (pci_enable_device(dev->pdev)) | 102 | if (pci_enable_device(dev->pdev)) |
105 | return -1; | 103 | return -1; |
106 | pci_set_master(dev->pdev); | 104 | pci_set_master(dev->pdev); |