diff mbox

[2/2] drm/i915: remove restore in resume

Message ID 1252896427-11669-2-git-send-email-zhenyuw@linux.intel.com (mailing list archive)
State Accepted
Headers show

Commit Message

Zhenyu Wang Sept. 14, 2009, 2:47 a.m. UTC 
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>
---
 drivers/gpu/drm/i915/i915_drv.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

Comments

Jesse Barnes Sept. 17, 2009, 9:45 p.m. UTC | #1 
On Mon, 14 Sep 2009 10:47:07 +0800
Zhenyu Wang <zhenyuw@linux.intel.com> wrote:

> 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>
> ---

Applied to drm-intel-next, thanks.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index dbe568c..e8cf18d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -97,8 +97,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);