Commit 12126482 authored Sep 14, 2009 by Zhenyu Wang Committed by Dave Airlie Sep 14, 2009

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 <stable@kernel.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

parent 5e8d6b8b

drivers/char/agp/intel-agp.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -2451,15 +2451,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)

Admin message