From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH 2/4] drm/i915: Tune down debug output when context is banned Date: Wed, 29 Jan 2014 12:47:13 -0800 Message-ID: <20140129204713.GC32231@bwidawsk.net> References: <1391007939-5741-1-git-send-email-mika.kuoppala@intel.com> <1391007939-5741-3-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id A6E0511E423 for ; Wed, 29 Jan 2014 12:47:30 -0800 (PST) Content-Disposition: inline In-Reply-To: <1391007939-5741-3-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org, miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org On Wed, Jan 29, 2014 at 05:05:37PM +0200, Mika Kuoppala wrote: > If we have stopped rings then we know that test is running > so no need for spam. In addition, only spam when default > context gets banned. > > v2: - make sure default context ban gets shown (Chris) > - use helper for checking for default context, everywhere (Chris) > > Reference: https://bugs.freedesktop.org/show_bug.cgi?id=73652 > Signed-off-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/i915_drv.h | 5 +++++ > drivers/gpu/drm/i915/i915_gem.c | 5 ++++- > drivers/gpu/drm/i915/i915_gem_context.c | 9 ++------- > 3 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 3673ba1..b34fd31 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2271,6 +2271,11 @@ static inline void i915_gem_context_unreference(struct i915_hw_context *ctx) > kref_put(&ctx->ref, i915_gem_context_free); > } > > +static inline bool i915_gem_context_is_default(const struct i915_hw_context *c) > +{ > + return c->id == DEFAULT_CONTEXT_ID; > +} > + > int i915_gem_context_create_ioctl(struct drm_device *dev, void *data, > struct drm_file *file); > int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index e41d520..8f9ac0a 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2319,7 +2319,10 @@ static bool i915_context_is_banned(const struct i915_hw_context *ctx) > return true; > > if (elapsed <= DRM_I915_CTX_BAN_PERIOD) { > - DRM_ERROR("context hanging too fast, declaring banned!\n"); > + if (dev_priv->gpu_error.stop_rings == 0 && > + i915_gem_context_is_default(ctx)) > + DRM_ERROR("context hanging too fast, banning!\n"); > + else DRM_DEBUG[_DRIVER](...)? Reviewed-by: Ben Widawsky > return true; > } > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 2b0598e..985c1ed 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -228,11 +228,6 @@ err_out: > return ERR_PTR(ret); > } > > -static inline bool is_default_context(struct i915_hw_context *ctx) > -{ > - return (ctx->id == DEFAULT_CONTEXT_ID); > -} > - > /** > * The default context needs to exist per ring that uses contexts. It stores the > * context state of the GPU for applications that don't utilize HW contexts, as > @@ -478,7 +473,7 @@ static int context_idr_cleanup(int id, void *p, void *data) > struct i915_hw_context *ctx = p; > > /* Ignore the default context because close will handle it */ > - if (is_default_context(ctx)) > + if (i915_gem_context_is_default(ctx)) > return 0; > > i915_gem_context_unreference(ctx); > @@ -656,7 +651,7 @@ static int do_switch(struct intel_ring_buffer *ring, > vma->bind_vma(vma, to->obj->cache_level, GLOBAL_BIND); > } > > - if (!to->is_initialized || is_default_context(to)) > + if (!to->is_initialized || i915_gem_context_is_default(to)) > hw_flags |= MI_RESTORE_INHIBIT; > > ret = mi_set_context(ring, to, hw_flags); > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ben Widawsky, Intel Open Source Technology Center