| Date | Thu, 01 Oct 2009 18:16:43 -0700 | From | Greg KH <> | Subject | [055/136] drm/i915: remove restore in resume |
| |
2.6.31-stable review patch. If anyone has any objections, please let us know.
------------------ From: Zhenyu Wang <zhenyuw@linux.intel.com>
commit b7e53aba2f0e6abf23e3f07b38b241145c33a005 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/gpu/drm/i915/i915_drv.c | 2 -- 1 file changed, 2 deletions(-)
--- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -94,8 +94,6 @@ static int i915_resume(struct drm_device 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);
|