From patchwork Mon Oct 15 02:10:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 1591991 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 815ADE00AD for ; Mon, 15 Oct 2012 02:23:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77E409F007 for ; Sun, 14 Oct 2012 19:23:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy12-pub.bluehost.com (oproxy12-pub.bluehost.com [50.87.16.10]) by gabe.freedesktop.org (Postfix) with SMTP id F12289F029 for ; Sun, 14 Oct 2012 19:10:40 -0700 (PDT) Received: (qmail 15219 invoked by uid 0); 15 Oct 2012 02:10:40 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy12.bluehost.com with SMTP; 15 Oct 2012 02:10:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=gDs5QOcoS96gh76pk5hyiZssJpqBkKENOn3RYdICFSU=; b=sRCgnmBa4QjC02wAKpfiBOOsSFv3mZMsarmCRX3IDf3xn0wMfCV4qIB6GoKFLvD8PD5P+KoniPIzsVlIlBNNkp53U6jVoUJEJaIx1jZk3W66zaoOjBxtOiMxIxfxRfRY; Received: from [12.216.224.66] (port=42917 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1TNa8e-0004T1-90 for intel-gfx@lists.freedesktop.org; Sun, 14 Oct 2012 20:10:40 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Sun, 14 Oct 2012 19:10:38 -0700 Message-Id: <1350267038-3599-3-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350267038-3599-1-git-send-email-jbarnes@virtuousgeek.org> References: <1350267038-3599-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 12.216.224.66 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 3/3] drm/i915: don't rewrite the GTT on resume X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org The BIOS shouldn't be touching this memory across suspend/resume, so just leave it alone. This saves us ~50ms on resume on my T420. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/i915_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 824e3c8..95e2b8b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -119,6 +119,10 @@ module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600); MODULE_PARM_DESC(i915_enable_ppgtt, "Enable PPGTT (default: true)"); +int i915_needs_gtt_restore __read_mostly = 0; +module_param_named(gtt_restore, i915_needs_gtt_restore, int, 0600); +MODULE_PARM_DESC(gtt_restore, "Rewrite GTT on resume (default: false)"); + static struct drm_driver driver; extern int intel_agp_enabled; @@ -537,7 +541,8 @@ static int i915_drm_thaw(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int error = 0; - if (drm_core_check_feature(dev, DRIVER_MODESET)) { + if (drm_core_check_feature(dev, DRIVER_MODESET) && + i915_needs_gtt_restore) { mutex_lock(&dev->struct_mutex); i915_gem_restore_gtt_mappings(dev); mutex_unlock(&dev->struct_mutex);