Commit 5e39b4d9 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Signal cancelled requests 



After marking the requests on an engine as cancelled upon wedging, send
any signals for their completions.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200930163253.2789-1-chris@chris-wilson.co.uk
parent b7eeb2b4

drivers/gpu/drm/i915/gt/intel_lrc.c

+1 −0
Original line number Diff line number Diff line
@@ -4407,6 +4407,7 @@ static void execlists_reset_cancel(struct intel_engine_cs *engine) 
	/* Mark all executing requests as skipped. */

	list_for_each_entry(rq, &engine->active.requests, sched.link)

		mark_eio(rq);

	intel_engine_signal_breadcrumbs(engine);



	/* Flush the queued requests to the timeline list (for retiring). */

	while ((rb = rb_first_cached(&execlists->queue))) {

drivers/gpu/drm/i915/gt/intel_ring_submission.c

+1 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ static void reset_cancel(struct intel_engine_cs *engine) 
		i915_request_set_error_once(request, -EIO);

		i915_request_mark_complete(request);

	}

	intel_engine_signal_breadcrumbs(engine);



	/* Remaining _unready_ requests will be nop'ed when submitted */