| Message ID | 20180514093710.7730-11-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/drivers/gpu/drm/i915/intel_hangcheck.c b/drivers/gpu/drm/i915/intel_hangcheck.c index d47e346bd49e..4b0745d94ab8 100644 --- a/drivers/gpu/drm/i915/intel_hangcheck.c +++ b/drivers/gpu/drm/i915/intel_hangcheck.c @@ -267,6 +267,21 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd) } } + if (test_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted)) { + if (GEM_SHOW_DEBUG()) { + struct drm_printer p = drm_debug_printer("hangcheck"); + + GEM_TRACE_DUMP(); + intel_engine_dump(engine, &p, + "%s CS stuck\n", engine->name); + } + + if (i915_tasklet_try(&engine->execlists.tasklet)) + return ENGINE_WAIT_KICK; + + return ENGINE_WAIT; + } + return ENGINE_DEAD; }
If inside hangcheck we see that the engine has paused, but there is an execlists interrupt still pending, we know that the tasklet did not fire. Dump the GEM trace along with the current engine state, and kick the tasklet to recovery without having to go through a GPU reset. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/intel_hangcheck.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)