From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Don't accumulate hangcheck score on forward progress Date: Tue, 5 Aug 2014 18:37:34 +0200 Message-ID: <20140805163734.GL8727@phenom.ffwll.local> References: <20140805132923.GC15200@nuc-i3427.alporthouse.com> <1407248186-12875-1-git-send-email-mika.kuoppala@intel.com> <20140805145308.GD15200@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id B36296E234 for ; Tue, 5 Aug 2014 09:37:28 -0700 (PDT) Received: by mail-wi0-f173.google.com with SMTP id f8so7258453wiw.12 for ; Tue, 05 Aug 2014 09:37:24 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20140805145308.GD15200@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Mika Kuoppala , intel-gfx@lists.freedesktop.org, zhenyuw@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org On Tue, Aug 05, 2014 at 03:53:08PM +0100, Chris Wilson wrote: > On Tue, Aug 05, 2014 at 05:16:26PM +0300, Mika Kuoppala wrote: > > If the actual head has progressed forward inside a batch (request), > > don't accumulate hangcheck score. > > > > As the hangcheck score in increased only by acthd jumping backwards, > > the result is that we only declare an active batch as stuck if it is > > trapped inside a loop. Or that the looping will dominate the batch > > progression so that it overcomes the bonus that forward progress gives. > > > > v2: Improved commit message (Chris Wilson) > > > > Signed-off-by: Mika Kuoppala > > --- > > drivers/gpu/drm/i915/i915_gpu_error.c | 2 ++ > > drivers/gpu/drm/i915/i915_irq.c | 15 ++++++++++++--- > > drivers/gpu/drm/i915/intel_ringbuffer.h | 2 ++ > > 3 files changed, 16 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > > index 9a13eed..a422f96 100644 > > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > > @@ -229,6 +229,8 @@ static const char *hangcheck_action_to_str(enum intel_ring_hangcheck_action a) > > return "wait"; > > case HANGCHECK_ACTIVE: > > return "active"; > > + case HANGCHECK_ACTIVE_LOOP: > > + return "active_loop"; > > This string is for the user, i.e. me, and I'd prefer it to say > "active (loop)" rather than have the underscore. Frobbed and > > Other than that, > Reviewed-by: Chris Wilson queued for -next, thanks for the patch. -Daniel > -Chris > > -- > Chris Wilson, Intel Open Source Technology Centre > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch