[Intel-gfx] [PATCH] drm/i915: Repeat the GEM_BUG_ON message in the ftrace log

Mika Kuoppala mika.kuoppala at linux.intel.com
Wed Feb 28 09:14:41 UTC 2018


Chris Wilson <chris at chris-wilson.co.uk> writes:

> As the ftrace log is overflowing the pstore capture, we lose the gasps
> from dmesg which includes the GEM_BUG_ON function:line and condition that
> failed. Vital information for tracking down the bug, so append it to the
> frace log as well.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h
> index e920dab7f1b8..d9f0709973d1 100644
> --- a/drivers/gpu/drm/i915/i915_gem.h
> +++ b/drivers/gpu/drm/i915/i915_gem.h
> @@ -29,7 +29,10 @@
>  
>  #ifdef CONFIG_DRM_I915_DEBUG_GEM
>  #define GEM_BUG_ON(condition) do { if (unlikely((condition))) {	\
> -		printk(KERN_ERR "GEM_BUG_ON(%s)\n", __stringify(condition)); \
> +		pr_err("%s:%d GEM_BUG_ON(%s)\n", \
> +		       __func__, __LINE__, __stringify(condition)); \
> +		GEM_TRACE("%s:%d GEM_BUG_ON(%s)\n", \
> +			  __func__, __LINE__, __stringify(condition)); \
>  		BUG(); \
>  		} \
>  	} while(0)
> -- 
> 2.16.2


More information about the Intel-gfx mailing list