From 8527d5dbc319319beb77e676bf5d8fcc53d68631 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 1 Sep 2009 14:02:41 +0800 Subject: [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, which might cause problem on some chips, like 845G tested by Alan Stern. Cc: Stable Team Cc: Alan Stern Signed-off-by: Zhenyu Wang --- drivers/char/agp/intel-agp.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index c585577..dee0f1f 100644 --- 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_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) -- 1.6.3.3