Commit a817c891 authored Jul 28, 2020 by Chris Wilson Committed by Joonas Lahtinen Sep 07, 2020

drm/i915/gt: Disable preparser around xcs invalidations on tgl

Unlike rcs where we have conclusive evidence from our selftesting that
disabling the preparser before performing the TLB invalidate and
relocations does impact upon the GPU execution, the evidence for the
same requirement on xcs is much more circumstantial. Let's apply the
preparser disable between batches as we invalidate the TLB as a dose of
healthy paranoia, just in case.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/2169

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200728152110.830-1-chris@chris-wilson.co.uk

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

parent 27a5dcfe

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -4757,14 +4757,21 @@ static int gen12_emit_flush(struct i915_request *request, u32 mode)
		intel_engine_mask_t aux_inv = 0;
		u32 cmd, *cs;

		cmd = 4;
		if (mode & EMIT_INVALIDATE)
		cmd += 2;
		if (mode & EMIT_INVALIDATE)
		aux_inv = request->engine->mask & ~BIT(BCS0);
		if (aux_inv)
		cmd += 2 * hweight8(aux_inv) + 2;

		cs = intel_ring_begin(request,
		4 + (aux_inv ? 2 * hweight8(aux_inv) + 2 : 0));
		cs = intel_ring_begin(request, cmd);
		if (IS_ERR(cs))
		return PTR_ERR(cs);

		if (mode & EMIT_INVALIDATE)
		*cs++ = preparser_disable(true);

		cmd = MI_FLUSH_DW + 1;

		/* We always require a command barrier so that subsequent
		@@ -4797,6 +4804,10 @@ static int gen12_emit_flush(struct i915_request *request, u32 mode)
		}
		*cs++ = MI_NOOP;
		}

		if (mode & EMIT_INVALIDATE)
		*cs++ = preparser_disable(false);

		intel_ring_advance(request, cs);

		return 0;