Commit d263545e authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/gt: Fix platform prefix 



Different handling for XeHP and later platforms should be using the
xehp prefix, not gen125. Rename them.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220930050903.3479619-4-lucas.demarchi@intel.com
parent b1f80a5a

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

+12 −12
Original line number Original line Diff line number Diff line
@@ -396,7 +396,7 @@ int gen8_emit_init_breadcrumb(struct i915_request *rq) 
	return 0;

	return 0;

}

}





static int __gen125_emit_bb_start(struct i915_request *rq,

static int __xehp_emit_bb_start(struct i915_request *rq,

				u64 offset, u32 len,

				u64 offset, u32 len,

				const unsigned int flags,

				const unsigned int flags,

				u32 arb)

				u32 arb)
@@ -437,18 +437,18 @@ static int __gen125_emit_bb_start(struct i915_request *rq, 
	return 0;

	return 0;

}

}





int gen125_emit_bb_start_noarb(struct i915_request *rq,

int xehp_emit_bb_start_noarb(struct i915_request *rq,

			     u64 offset, u32 len,

			     u64 offset, u32 len,

			     const unsigned int flags)

			     const unsigned int flags)

{

{

	return __gen125_emit_bb_start(rq, offset, len, flags, MI_ARB_DISABLE);

	return __xehp_emit_bb_start(rq, offset, len, flags, MI_ARB_DISABLE);

}

}





int gen125_emit_bb_start(struct i915_request *rq,

int xehp_emit_bb_start(struct i915_request *rq,

		       u64 offset, u32 len,

		       u64 offset, u32 len,

		       const unsigned int flags)

		       const unsigned int flags)

{

{

	return __gen125_emit_bb_start(rq, offset, len, flags, MI_ARB_ENABLE);

	return __xehp_emit_bb_start(rq, offset, len, flags, MI_ARB_ENABLE);

}

}





int gen8_emit_bb_start_noarb(struct i915_request *rq,

int gen8_emit_bb_start_noarb(struct i915_request *rq,

drivers/gpu/drm/i915/gt/gen8_engine_cs.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -32,10 +32,10 @@ int gen8_emit_bb_start(struct i915_request *rq, 
		       u64 offset, u32 len,

		       u64 offset, u32 len,

		       const unsigned int flags);

		       const unsigned int flags);





int gen125_emit_bb_start_noarb(struct i915_request *rq,

int xehp_emit_bb_start_noarb(struct i915_request *rq,

			     u64 offset, u32 len,

			     u64 offset, u32 len,

			     const unsigned int flags);

			     const unsigned int flags);

int gen125_emit_bb_start(struct i915_request *rq,

int xehp_emit_bb_start(struct i915_request *rq,

		       u64 offset, u32 len,

		       u64 offset, u32 len,

		       const unsigned int flags);

		       const unsigned int flags);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -3471,9 +3471,9 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) 




	if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) {

	if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50)) {

		if (intel_engine_has_preemption(engine))

		if (intel_engine_has_preemption(engine))

			engine->emit_bb_start = gen125_emit_bb_start;

			engine->emit_bb_start = xehp_emit_bb_start;

		else

		else

			engine->emit_bb_start = gen125_emit_bb_start_noarb;

			engine->emit_bb_start = xehp_emit_bb_start_noarb;

	} else {

	} else {

		if (intel_engine_has_preemption(engine))

		if (intel_engine_has_preemption(engine))

			engine->emit_bb_start = gen8_emit_bb_start;

			engine->emit_bb_start = gen8_emit_bb_start;

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4094,7 +4094,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) 




	engine->emit_bb_start = gen8_emit_bb_start;

	engine->emit_bb_start = gen8_emit_bb_start;

	if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50))

	if (GRAPHICS_VER_FULL(engine->i915) >= IP_VER(12, 50))

		engine->emit_bb_start = gen125_emit_bb_start;

		engine->emit_bb_start = xehp_emit_bb_start;

}

}





static void rcs_submission_override(struct intel_engine_cs *engine)

static void rcs_submission_override(struct intel_engine_cs *engine)