From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758103AbZIPWfe (ORCPT ); Wed, 16 Sep 2009 18:35:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757167AbZIPWc5 (ORCPT ); Wed, 16 Sep 2009 18:32:57 -0400 Received: from kroah.org ([198.145.64.141]:40913 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757336AbZIPWc2 (ORCPT ); Wed, 16 Sep 2009 18:32:28 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Wed Sep 16 15:29:01 2009 Message-Id: <20090916222901.073774303@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 16 Sep 2009 15:28:22 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Alan Stern , Zhenyu Wang , Dave Airlie Subject: [patch 03/24] agp/intel: remove restore in resume References: <20090916222819.244332644@mini.kroah.org> Content-Disposition: inline; filename=agp-intel-remove-restore-in-resume.patch In-Reply-To: <20090916222934.GA31846@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Zhenyu Wang 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 Signed-off-by: Zhenyu Wang Signed-off-by: Dave Airlie Signed-off-by: Greg Kroah-Hartman --- 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 @@ -2299,15 +2299,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)