If we haven't even begun executing the payload of the stalled request, then we should not claim that its userspace context was guilty of submitting a hanging batch.
Signed-off-by: Chris Wilson <[email protected]> --- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 0869a4fd20c7..8e301f19036b 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1947,7 +1947,7 @@ static void execlists_reset(struct intel_engine_cs *engine, bool stalled) rq ? rq->global_seqno : 0, intel_engine_get_seqno(engine), yesno(stalled)); - if (!rq) + if (!rq || !i915_request_started(rq)) goto out_unlock; /* diff --git a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c index 4886fac12628..36c17bfe05a7 100644 --- a/drivers/gpu/drm/i915/selftests/intel_hangcheck.c +++ b/drivers/gpu/drm/i915/selftests/intel_hangcheck.c @@ -246,6 +246,12 @@ hang_create_request(struct hang *h, struct intel_engine_cs *engine) if (INTEL_GEN(vm->i915) <= 5) flags |= I915_DISPATCH_SECURE; + if (rq->engine->emit_init_breadcrumb) { + err = rq->engine->emit_init_breadcrumb(rq); + if (err) + goto cancel_rq; + } + err = rq->engine->emit_bb_start(rq, vma->node.start, PAGE_SIZE, flags); cancel_rq: -- 2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
