From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH] drm/i915: Reinstate error level message for non-simulated gpu hangs Date: Wed, 01 Oct 2014 17:40:49 +0300 Message-ID: <87y4szsvim.fsf@gaia.fi.intel.com> References: <1412118259-4860-1-git-send-email-daniel.vetter@ffwll.ch> <1412164990-27013-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 985476E355 for ; Wed, 1 Oct 2014 07:41:28 -0700 (PDT) In-Reply-To: <1412164990-27013-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Daniel Vetter writes: > This seems to have been accidentally lost in > > commit be62acb4cce1389a28296852737e3917d9cc5b25 > Author: Mika Kuoppala > Date: Fri Aug 30 16:19:28 2013 +0300 > > drm/i915: ban badly behaving contexts > > Without this real gpu hangs only log output at info level, which gets > filtered away by piglit's testrunner. > > v2: Tune down to notice level. Note that we need to add drm/i915 so > that at least the automatic igt dmesg filtering still picks it up. > > v3: git add and lack of coffee don't mix well. > > v4: Message is in between hw and sw reset, so switch verb to > continuous form. > > v5: Use i915_stop_rings_allow_warn for consistency. For Chris' case of > injecting lots of hangs I guess we need to revamp this all anyway when > merging. For now this should plug the regression for piglit testing > mesa. > > Cc: Mika Kuoppala > Cc: Chris Wilson > Cc: Kenneth Graunke > Reported-by: Kenneth Graunke > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_drv.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index ea93ff151a74..fec4afe526c7 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -844,6 +844,9 @@ int i915_reset(struct drm_device *dev) > } > } > > + if (i915_stop_rings_allow_warn(dev_priv)) > + pr_notice("drm/i915: Resetting chip after gpu hang\n"); > + I would have added also: "As of now, further functionality or performance testing beyond this point is utterly pointless." Perhaps in caps. -Mika > if (ret) { > DRM_ERROR("Failed to reset chip: %i\n", ret); > mutex_unlock(&dev->struct_mutex); > -- > 2.1.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx