Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0051163a authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/execlists: Always clear preempt status on cancelling all 



On reset/wedging, we cancel all pending replies from the HW and we also
want to cancel an outstanding preemption event. Since we use the same
function to cancel the pending replies for reset and for a preemption
event, we can simply clear the active tracking for all.

v2: Keep execlists_user_end() markup for wedging
v3: Move assignment to inline to hide the bare assignment.

Fixes: 60a94324 ("drm/i915/execlists: Drop clear_gtiir() on GPU reset")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180716125424.5715-1-chris@chris-wilson.co.uk
parent f1a498fa

drivers/gpu/drm/i915/intel_guc_submission.c

+0 −2
Original line number Diff line number Diff line
@@ -633,8 +633,6 @@ static void complete_preempt_context(struct intel_engine_cs *engine) 


	wait_for_guc_preempt_report(engine);

	intel_write_status_page(engine, I915_GEM_HWS_PREEMPT_INDEX, 0);



	execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

}



/**

drivers/gpu/drm/i915/intel_lrc.c

+2 −4
Original line number Diff line number Diff line
@@ -563,8 +563,6 @@ static void complete_preempt_context(struct intel_engine_execlists *execlists) 
	__unwind_incomplete_requests(container_of(execlists,

						  struct intel_engine_cs,

						  execlists));



	execlists_clear_active(execlists, EXECLISTS_ACTIVE_PREEMPT);

}



static void execlists_dequeue(struct intel_engine_cs *engine)
@@ -792,8 +790,7 @@ execlists_cancel_port_requests(struct intel_engine_execlists * const execlists) 
		port++;

	}



	execlists_clear_active(execlists, EXECLISTS_ACTIVE_USER);

	execlists_user_end(execlists);

	execlists_clear_all_active(execlists);

}



static void reset_csb_pointers(struct intel_engine_execlists *execlists)
@@ -844,6 +841,7 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine) 


	/* Cancel the requests on the HW and clear the ELSP tracker. */

	execlists_cancel_port_requests(execlists);

	execlists_user_end(execlists);



	/* Mark all executing requests as skipped. */

	list_for_each_entry(rq, &engine->timeline.requests, link) {

drivers/gpu/drm/i915/intel_ringbuffer.h

+6 −0
Original line number Diff line number Diff line
@@ -683,6 +683,12 @@ execlists_clear_active(struct intel_engine_execlists *execlists, 
	__clear_bit(bit, (unsigned long *)&execlists->active);

}



static inline void

execlists_clear_all_active(struct intel_engine_execlists *execlists)

{

	execlists->active = 0;

}



static inline bool

execlists_is_active(const struct intel_engine_execlists *execlists,

		    unsigned int bit)