From patchwork Thu Mar 27 06:41:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 3896551 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E2CBC9F2B6 for ; Thu, 27 Mar 2014 06:41:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0ED4E20213 for ; Thu, 27 Mar 2014 06:41:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 066C620122 for ; Thu, 27 Mar 2014 06:41:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 23AD76E4A6; Wed, 26 Mar 2014 23:41:44 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id 08E316E4A6 for ; Wed, 26 Mar 2014 23:41:43 -0700 (PDT) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E68F7ABE5; Thu, 27 Mar 2014 06:41:41 +0000 (UTC) Date: Thu, 27 Mar 2014 07:41:41 +0100 Message-ID: From: Takashi Iwai To: Daniel Vetter In-Reply-To: <1395861009-9639-1-git-send-email-daniel.vetter@ffwll.ch> References: <1395861009-9639-1-git-send-email-daniel.vetter@ffwll.ch> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Intel Graphics Development , Paulo Zanoni , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Undo gtt scratch pte unmapping again X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP At Wed, 26 Mar 2014 20:10:09 +0100, Daniel Vetter wrote: > > It apparently blows up on some machines. This functionally reverts > > commit 828c79087cec61eaf4c76bb32c222fbe35ac3930 > Author: Ben Widawsky > Date: Wed Oct 16 09:21:30 2013 -0700 > > drm/i915: Disable GGTT PTEs on GEN6+ suspend > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=64841 > Reported-and-Tested-by: Brad Jackson > Cc: stable@vger.kernel.org > Cc: Takashi Iwai > Cc: Paulo Zanoni > Cc: Todd Previte > Signed-off-by: Daniel Vetter The commit was the fix for the memory corruption and lock up at S4 on some (Haswell) machines. This revert will re-introduce the issue again very likely. I'm going to check with the latest tree, but this may take some time. Wouldn't it be safer to revert this conditionally like I suggested in comment 10 of the bugzilla entry? i915_check_and_clear_faults(dev); thanks, Takashi > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 5d61de18ae55..4467974eb53b 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1281,7 +1281,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) > dev_priv->gtt.base.clear_range(&dev_priv->gtt.base, > dev_priv->gtt.base.start, > dev_priv->gtt.base.total, > - false); > + true); > } > > void i915_gem_restore_gtt_mappings(struct drm_device *dev) > -- > 1.8.5.2 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -818,7 +818,7 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) /* Don't bother messing with faults pre GEN6 as we have little * documentation supporting that it's a good idea. */ - if (INTEL_INFO(dev)->gen < 6) + if (INTEL_INFO(dev)->gen < 7) return;