From patchwork Mon Mar 6 12:10:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 9605915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 588DC6046A for ; Mon, 6 Mar 2017 12:10:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50D8828391 for ; Mon, 6 Mar 2017 12:10:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4595728402; Mon, 6 Mar 2017 12:10:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 07B6928391 for ; Mon, 6 Mar 2017 12:10:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E67356E421; Mon, 6 Mar 2017 12:10:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from atrey.karlin.mff.cuni.cz (atrey.karlin.mff.cuni.cz [195.113.26.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7324B6E41D; Mon, 6 Mar 2017 12:10:52 +0000 (UTC) Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 8A33681678; Mon, 6 Mar 2017 13:10:48 +0100 (CET) Date: Mon, 6 Mar 2017 13:10:48 +0100 From: Pavel Machek To: Chris Wilson , kernel list , daniel.vetter@intel.com, jani.nikula@linux.intel.com, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Message-ID: <20170306121047.GB15063@amd> References: <20170228143453.GA11914@amd> <20170228150222.GU10304@nuc-i3427.alporthouse.com> <20170305230150.GA15063@amd> <20170306111528.GR5997@nuc-i3427.alporthouse.com> MIME-Version: 1.0 In-Reply-To: <20170306111528.GR5997@nuc-i3427.alporthouse.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [Intel-gfx] [regression] Re: 4.11-rc0, thinkpad x220: GPU hang X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP On Mon 2017-03-06 11:15:28, Chris Wilson wrote: > On Mon, Mar 06, 2017 at 12:01:51AM +0100, Pavel Machek wrote: > > Hi! > > > > > > mplayer stopped working after a while. Dmesg says: > > > > > > > > [ 3000.266533] cdc_ether 2-1.2:1.0 usb0: register 'cdc_ether' at > > > > Now I'm pretty sure it is a regression in v4.11-rc0. Any ideas what to > > try? Bisect will be slow and nasty :-(. > > I came the conclusion that #99671 is the ring HEAD overtaking the TAIL, > and under the presumption that your bug matches (as the symptoms do): > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 4ffa35faff49..62e31a7438ac 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -782,10 +782,10 @@ static void i9xx_submit_request(struct drm_i915_gem_request *request) > { > struct drm_i915_private *dev_priv = request->i915; > > - i915_gem_request_submit(request); > - > GEM_BUG_ON(!IS_ALIGNED(request->tail, 8)); > I915_WRITE_TAIL(request->engine, request->tail); > + > + i915_gem_request_submit(request); > } > > static void i9xx_emit_breadcrumb(struct drm_i915_gem_request *req, u32 *cs) I applied it as: Hmm. But your next mail suggest that it may not be smart to try to boot it? :-). Pavel diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 91bc4ab..9c49c7a 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1338,9 +1338,9 @@ static void i9xx_submit_request(struct drm_i915_gem_request *request) { struct drm_i915_private *dev_priv = request->i915; - i915_gem_request_submit(request); - I915_WRITE_TAIL(request->engine, request->tail); + + i915_gem_request_submit(request); } static void i9xx_emit_breadcrumb(struct drm_i915_gem_request *req,