[PATCH v2 6/6] drm/i915/gt: Remove unused I915_ENGINE_FIRST_RENDER_COMPUTE flag

[Lucas De Marchi]

On Thu, Mar 27, 2025 at 12:40:05AM +0100, Andi Shyti wrote:
>From: Andi Shyti <andi.shyti at intel.com>
>
>The I915_ENGINE_FIRST_RENDER_COMPUTE flag is no longer used.
>Its purpose has been replaced by the FIRST_CCS() helper, which
>determines the first render or compute engine as needed.

which is not true since you implemented the macro exclusively using
CCS_MASK, so it only means compute and will skip applying the
workarounds on platforms that don't have compute but have render.

Lucas De Marchi

>
>Remove the flag definition and its assignment from
>intel_engine_setup().
>
>Suggested-by: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Andi Shyti <andi.shyti at intel.com>
>---
> drivers/gpu/drm/i915/gt/intel_engine_cs.c    | 4 ----
> drivers/gpu/drm/i915/gt/intel_engine_types.h | 3 +--
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
>index b721bbd23356..1b60be057192 100644
>--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
>+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
>@@ -497,10 +497,6 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id,
> 	engine->logical_mask = BIT(logical_instance);
> 	__sprint_engine_name(engine);
>
>-	if ((engine->class == COMPUTE_CLASS || engine->class == RENDER_CLASS) &&
>-	    __ffs(CCS_MASK(engine->gt) | RCS_MASK(engine->gt)) == engine->instance)
>-		engine->flags |= I915_ENGINE_FIRST_RENDER_COMPUTE;
>-
> 	/* features common between engines sharing EUs */
> 	if (engine->class == RENDER_CLASS || engine->class == COMPUTE_CLASS) {
> 		engine->flags |= I915_ENGINE_HAS_RCS_REG_STATE;
>diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
>index 155b6255a63e..c5529b966b7a 100644
>--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
>+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
>@@ -590,8 +590,7 @@ struct intel_engine_cs {
> #define I915_ENGINE_WANT_FORCED_PREEMPTION BIT(8)
> #define I915_ENGINE_HAS_RCS_REG_STATE  BIT(9)
> #define I915_ENGINE_HAS_EU_PRIORITY    BIT(10)
>-#define I915_ENGINE_FIRST_RENDER_COMPUTE BIT(11)
>-#define I915_ENGINE_USES_WA_HOLD_SWITCHOUT BIT(12)
>+#define I915_ENGINE_USES_WA_HOLD_SWITCHOUT BIT(11)
> 	unsigned int flags;
>
> 	/*
>-- 
>2.47.2
>