summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2009-09-14 10:47:06 +0800
committerDave Airlie <airlied@linux.ie>2009-09-14 19:17:44 +1000
commit121264827656f5f06328b17983c796af17dc5949 (patch)
tree681b1c46ee7950eaac52072c0fb8c20f264987e0 /drivers/char
parent5e8d6b8bf94f1ffcb7e3c31b73284c20f297f191 (diff)
downloadop-kernel-dev-121264827656f5f06328b17983c796af17dc5949.zip
op-kernel-dev-121264827656f5f06328b17983c796af17dc5949.tar.gz
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-agp.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 9bc3a0b..5eeaeee 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -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)
OpenPOWER on IntegriCloud