drm/i915/gt: Small tidy of gen8+ breadcrumb emission (25fd6de3) · Commits · 戴 / test

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

+15 −19

Original line number	Diff line number	Diff line
		@@ -4641,8 +4641,7 @@ static u32 emit_preempt_busywait(struct i915_request request, u32 *cs)
		}

		static __always_inline u32*
		gen8_emit_fini_breadcrumb_footer(struct i915_request *request,
		u32 *cs)
		gen8_emit_fini_breadcrumb_tail(struct i915_request request, u32 cs)
		{
		*cs++ = MI_USER_INTERRUPT;

		@@ -4656,14 +4655,16 @@ gen8_emit_fini_breadcrumb_footer(struct i915_request *request,
		return gen8_emit_wa_tail(request, cs);
		}

		static u32 gen8_emit_fini_breadcrumb(struct i915_request request, u32 *cs)
		static u32 emit_xcs_breadcrumb(struct i915_request request, u32 *cs)
		{
		cs = gen8_emit_ggtt_write(cs,
		request->fence.seqno,
		i915_request_active_timeline(request)->hwsp_offset,
		0);
		u32 addr = i915_request_active_timeline(request)->hwsp_offset;

		return gen8_emit_ggtt_write(cs, request->fence.seqno, addr, 0);
		}

		return gen8_emit_fini_breadcrumb_footer(request, cs);
		static u32 gen8_emit_fini_breadcrumb(struct i915_request rq, u32 *cs)
		{
		return gen8_emit_fini_breadcrumb_tail(rq, emit_xcs_breadcrumb(rq, cs));
		}

		static u32 gen8_emit_fini_breadcrumb_rcs(struct i915_request request, u32 *cs)
		@@ -4681,7 +4682,7 @@ static u32 gen8_emit_fini_breadcrumb_rcs(struct i915_request request, u32 *cs)
		PIPE_CONTROL_FLUSH_ENABLE \|
		PIPE_CONTROL_CS_STALL);

		return gen8_emit_fini_breadcrumb_footer(request, cs);
		return gen8_emit_fini_breadcrumb_tail(request, cs);
		}

		static u32 *
		@@ -4697,7 +4698,7 @@ gen11_emit_fini_breadcrumb_rcs(struct i915_request request, u32 cs)
		PIPE_CONTROL_DC_FLUSH_ENABLE \|
		PIPE_CONTROL_FLUSH_ENABLE);

		return gen8_emit_fini_breadcrumb_footer(request, cs);
		return gen8_emit_fini_breadcrumb_tail(request, cs);
		}

		/*
		@@ -4735,7 +4736,7 @@ static u32 gen12_emit_preempt_busywait(struct i915_request request, u32 *cs)
		}

		static __always_inline u32*
		gen12_emit_fini_breadcrumb_footer(struct i915_request request, u32 cs)
		gen12_emit_fini_breadcrumb_tail(struct i915_request request, u32 cs)
		{
		*cs++ = MI_USER_INTERRUPT;

		@@ -4749,14 +4750,9 @@ gen12_emit_fini_breadcrumb_footer(struct i915_request request, u32 cs)
		return gen8_emit_wa_tail(request, cs);
		}

		static u32 gen12_emit_fini_breadcrumb(struct i915_request request, u32 *cs)
		static u32 gen12_emit_fini_breadcrumb(struct i915_request rq, u32 *cs)
		{
		cs = gen8_emit_ggtt_write(cs,
		request->fence.seqno,
		i915_request_active_timeline(request)->hwsp_offset,
		0);

		return gen12_emit_fini_breadcrumb_footer(request, cs);
		return gen12_emit_fini_breadcrumb_tail(rq, emit_xcs_breadcrumb(rq, cs));
		}

		static u32 *
		@@ -4775,7 +4771,7 @@ gen12_emit_fini_breadcrumb_rcs(struct i915_request request, u32 cs)
		PIPE_CONTROL_FLUSH_ENABLE \|
		PIPE_CONTROL_HDC_PIPELINE_FLUSH);

		return gen12_emit_fini_breadcrumb_footer(request, cs);
		return gen12_emit_fini_breadcrumb_tail(request, cs);
		}

		static void execlists_park(struct intel_engine_cs *engine)

Admin message