| From 121264827656f5f06328b17983c796af17dc5949 Mon Sep 17 00:00:00 2001 |
| From: Zhenyu Wang <zhenyuw@linux.intel.com> |
| Date: Mon, 14 Sep 2009 10:47:06 +0800 |
| Subject: agp/intel: remove restore in resume |
| |
| From: Zhenyu Wang <zhenyuw@linux.intel.com> |
| |
| commit 121264827656f5f06328b17983c796af17dc5949 upstream. |
| |
| 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: Alan Stern <stern@rowland.harvard.edu> |
| Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> |
| Signed-off-by: Dave Airlie <airlied@linux.ie> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/char/agp/intel-agp.c | 9 --------- |
| 1 file changed, 9 deletions(-) |
| |
| --- a/drivers/char/agp/intel-agp.c |
| +++ b/drivers/char/agp/intel-agp.c |
| @@ -2313,15 +2313,6 @@ static int agp_intel_resume(struct pci_d |
| 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) |