diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-09-14 10:47:07 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-05 09:32:04 -0700 |
| commit | 385c165f9edb248473bc442cc2aa8a95e01e8fdb (patch) | |
| tree | 936f7d61574cea2d47911ebd5488fd2238a26fdc | |
| parent | 50afc605df1dc89d55c4ef1648dce601b858b65b (diff) | |
| download | linux-jz47xx-385c165f9edb248473bc442cc2aa8a95e01e8fdb.tar.gz | |
drm/i915: remove restore in resume
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>
| -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 fc4b68aa2d0..c078d995aa9 100644 --- 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 *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); |