From patchwork Fri Sep 4 01:43:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 45470 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n841hg6x002912 for ; Fri, 4 Sep 2009 01:43:42 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08122A0924; Thu, 3 Sep 2009 18:43:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from azsmga102.ch.intel.com (mga12.intel.com [143.182.124.36]) by gabe.freedesktop.org (Postfix) with ESMTP id 41B279E92B for ; Thu, 3 Sep 2009 18:43:39 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 03 Sep 2009 18:43:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,271,1249282800"; d="scan'208";a="183952799" Received: from debian-i915.sh.intel.com (HELO localhost.localdomain) ([10.239.36.110]) by azsmga001.ch.intel.com with ESMTP; 03 Sep 2009 18:43:38 -0700 From: Zhenyu Wang To: intel-gfx@lists.freedesktop.org Date: Fri, 4 Sep 2009 09:43:34 +0800 Message-Id: <1252028615-13785-1-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 Cc: Alan Stern , linux-kernel@vger.kernel.org, Stable Team Subject: [Intel-gfx] [PATCH 1/3] agp/intel: remove restore in resume X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org 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)