From patchwork Tue Aug 13 17:13:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 2843899 Return-Path: X-Original-To: patchwork-dri-devel@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 3B7209F239 for ; Tue, 13 Aug 2013 17:16:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EBAF2042B for ; Tue, 13 Aug 2013 17:16:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0910D20415 for ; Tue, 13 Aug 2013 17:16:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0195AE76B7 for ; Tue, 13 Aug 2013 10:16:54 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fireflyinternet.com (s16502780.onlinehome-server.info [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id CF74AE7AE2; Tue, 13 Aug 2013 10:14:01 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.73.22; Received: from cantiga.alporthouse.com (unverified [78.156.73.22]) by fireflyinternet.com (Firefly Internet (M2)) with ESMTP id 12893121-1500048 for multiple; Tue, 13 Aug 2013 18:13:50 +0100 Received: by cantiga.alporthouse.com (sSMTP sendmail emulation); Tue, 13 Aug 2013 18:13:24 +0100 Date: Tue, 13 Aug 2013 18:13:24 +0100 From: Chris Wilson To: Sedat Dilek Subject: Re: linux-next: Tree for Aug 13 [ screen corruption in graphical mode ] Message-ID: <20130813171324.GB8805@cantiga.alporthouse.com> Mail-Followup-To: Chris Wilson , Sedat Dilek , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Vetter , Dave Airlie , DRI , intel-gfx , "s.dilek" References: <20130813095259.GC4519@cantiga.alporthouse.com> <20130813163439.GA8805@cantiga.alporthouse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: 78.156.73.22 Cc: Stephen Rothwell , Daniel Vetter , intel-gfx , linux-kernel@vger.kernel.org, DRI , linux-next@vger.kernel.org, "s.dilek" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-7.0 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 On Tue, Aug 13, 2013 at 07:03:44PM +0200, Sedat Dilek wrote: > On Tue, Aug 13, 2013 at 6:37 PM, Sedat Dilek wrote: > > On Tue, Aug 13, 2013 at 6:34 PM, Chris Wilson wrote: > >> On Tue, Aug 13, 2013 at 06:23:29PM +0200, Sedat Dilek wrote: > >>> On Tue, Aug 13, 2013 at 5:59 PM, Sedat Dilek wrote: > >>> > I have bisected the issue on Linux v3.11-rc5 + drm-intel-nightly: > >>> > > >>> > 5456fe3882812aba251886e36fe55bfefb8e8829 is the first bad commit > >>> > commit 5456fe3882812aba251886e36fe55bfefb8e8829 > >>> > Author: Chris Wilson > >>> > Date: Thu Aug 8 14:41:07 2013 +0100 > >>> > > >>> > drm/i915: Allocate LLC ringbuffers from stolen > >>> > > >>> > As stolen objects now behave identically (wrt to default LLC cacheing) > >>> > as their normal system counterparts, we no longer have to differentiate > >>> > our usage for ringbuffers. So allocate them from stolen on SNB+ as well. > >>> > > >>> > Signed-off-by: Chris Wilson > >>> > Reviewed-by: Ville Syrjälä > >>> > Signed-off-by: Daniel Vetter > >>> > > >>> > :040000 040000 de063a052f39095f4d2f51b49caef9f827df41e8 > >>> > 1c819aa5501a9fcc9912a5c7c037c71b9b9e9a6b M drivers > >>> > > >>> > See also attached files! > >>> > > >>> > >>> With the attached revert-patch my system is OK (with my customized X stack). > >> > >> No indication of a GPU hang? I'm puzzled as to how this ends up with the > >> scanout being misread. > >> > >> cat /sys/kernel/debug/dri/0/i915_gem_stolen > >> cat /sys/kernel/debug/dri/0/i915_gem_framebuffer > >> > >> would be interesting. > Attached both outputs with GOOD and BAD (BROKEN) kernel. ggtt offset is the same for both setups, the only difference between the two is the location of fbcon in stolen memory. Can you please attach the output of intel_reg_dumper for good/bad? It's a long shot... Speaking of long shots, try this (slightly different to the earlier patch): diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a21f935..37ad772 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1850,6 +1850,9 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, BUG(); } + if (obj->stolen && INTEL_INFO(dev)->gen >= 6) + alignment = 256 * 1024; + /* Note that the w/a also requires 64 PTE of padding following the * bo. We currently fill all unused PTE with the shadow page and so * we should always have valid PTE following the scanout preventing