| Message ID | 20191119100929.2628356-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] drm/i915/gem: Manually dump the debug trace on GEM_BUG_ON | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > Since igt now defaults to not enabling ftrace-on-oops, we need to > manually invoke GEM_TRACE_DUMP() to see the debug log prior to a > GEM_BUG_ON panicking. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_gem.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h > index c7985767296a..1753c84d6c0d 100644 > --- a/drivers/gpu/drm/i915/i915_gem.h > +++ b/drivers/gpu/drm/i915/i915_gem.h > @@ -30,6 +30,8 @@ > > #include <drm/drm_drv.h> > > +#include "i915_utils.h" > + > struct drm_i915_private; > > #ifdef CONFIG_DRM_I915_DEBUG_GEM > @@ -39,6 +41,7 @@ struct drm_i915_private; > #define GEM_BUG_ON(condition) do { if (unlikely((condition))) { \ > GEM_TRACE_ERR("%s:%d GEM_BUG_ON(%s)\n", \ > __func__, __LINE__, __stringify(condition)); \ > + GEM_TRACE_DUMP(); \ > BUG(); \ > } \ > } while(0) > -- > 2.24.0
diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h index c7985767296a..1753c84d6c0d 100644 --- a/drivers/gpu/drm/i915/i915_gem.h +++ b/drivers/gpu/drm/i915/i915_gem.h @@ -30,6 +30,8 @@ #include <drm/drm_drv.h> +#include "i915_utils.h" + struct drm_i915_private; #ifdef CONFIG_DRM_I915_DEBUG_GEM @@ -39,6 +41,7 @@ struct drm_i915_private; #define GEM_BUG_ON(condition) do { if (unlikely((condition))) { \ GEM_TRACE_ERR("%s:%d GEM_BUG_ON(%s)\n", \ __func__, __LINE__, __stringify(condition)); \ + GEM_TRACE_DUMP(); \ BUG(); \ } \ } while(0)
Since igt now defaults to not enabling ftrace-on-oops, we need to manually invoke GEM_TRACE_DUMP() to see the debug log prior to a GEM_BUG_ON panicking. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem.h | 3 +++ 1 file changed, 3 insertions(+)