agp/intel: remove restore in resume
Subsystems (3)
PATCH 1/2 agp/intel: remove restore in resume
As early pci resume has already restored config for host bridge and graphics device, don't need to restore it again, This removes an original order hack for graphics device restore.
This fixed the resume hang issue found by Alan Stern on 845G, caused by extra config restore on graphics device.
Cc Stable Team <[email protected]>
Cc Alan Stern <[email protected]>
Signed-off-by Zhenyu Wang <[email protected]>
--- drivers/char/agp/intel-agp.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
drivers/char/agp/intel-agp.c +0 -9
@@ -2335,15 +2335,6 @@ static int agp_intel_resume(struct pci_dev *pdev)struct agp_bridge_data *bridge =pci_get_drvdata (pdev);int ret_val; -pci_restore_state (pdev); - -/* We should restore our graphics device's config space, -* as host bridge (00:00) resumes before graphics device (02:00), -* then our access to its pci space can work right. -*/ -if (intel_private.pcidev) -pci_restore_state (intel_private.pcidev); -if (bridge->driver == &intel_generic_driver)intel_configure ();else if (bridge->driver == &intel_850_driver)
Signature · 1 line
1.6.3.3
PATCH 2/2 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 <[email protected]>
Cc Alan Stern <[email protected]>
Signed-off-by Zhenyu Wang <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -2
@@ -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);
Signature · 1 line
1.6.3.3
Jesse Barnes
AppliedRe: [Intel-gfx] [PATCH 2/2] drm/i915: remove restore in resume
Quoted 7 lines · On Mon, 14 Sep 2009 10:47:07 +0800 Zhenyu Wang <[email protected]> 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 <[email protected]>Cc Alan Stern <[email protected]>Signed-off-by Zhenyu Wang <[email protected]>---
Applied to drm-intel-next, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center