Commit b7e53aba authored Sep 14, 2009 by Zhenyu Wang Committed by Jesse Barnes Sep 17, 2009

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>

parent 07f73f69

drivers/gpu/drm/i915/i915_drv.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);