drm/i915: Remove lite restore defines (48d7fb18) · Commits · 戴 / test

We have switched from tail manipulation to forced context restore to implement WaIdleLiteRestore. Remove the old defines and comments. Note: we still do emit the WA tail, and use it as our first attempt to avoid forcing a full-restore instead of a lite-restore, we just have a much stronger backup mechanism for repeated preemptions. References: ("drm/i915/gt: Detect if we miss WaIdleLiteRestore") Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by:

Mika Kuoppala <mika.kuoppala@linux.intel.com> Reviewed-by:

Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by:

Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20200203163312.15475-1-mika.kuoppala@linux.intel.com

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

+0 −18

Original line number	Diff line number	Diff line
		@@ -176,8 +176,6 @@

		/* Typical size of the average request (2 pipecontrols and a MI_BB) */
		#define EXECLISTS_REQUEST_SIZE 64 /* bytes */
		#define WA_TAIL_DWORDS 2
		#define WA_TAIL_BYTES (sizeof(u32) * WA_TAIL_DWORDS)

		struct virtual_engine {
		struct intel_engine_cs base;
		@@ -2935,22 +2933,6 @@ static void execlists_context_reset(struct intel_context *ce)
		CE_TRACE(ce, "reset\n");
		GEM_BUG_ON(!intel_context_is_pinned(ce));

		/*
		* Because we emit WA_TAIL_DWORDS there may be a disparity
		* between our bookkeeping in ce->ring->head and ce->ring->tail and
		* that stored in context. As we only write new commands from
		* ce->ring->tail onwards, everything before that is junk. If the GPU
		* starts reading from its RING_HEAD from the context, it may try to
		* execute that junk and die.
		*
		* The contexts that are stilled pinned on resume belong to the
		* kernel, and are local to each engine. All other contexts will
		* have their head/tail sanitized upon pinning before use, so they
		* will never see garbage,
		*
		* So to avoid that we reset the context images upon resume. For
		* simplicity, we just zero everything out.
		*/
		intel_ring_reset(ce->ring, ce->ring->emit);

		/* Scrub away the garbage */

Admin message