Commit 1bfc03b1 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915: Remove special handling for !RCS_MASK() 



With both XEHPSDV and PVC removed (as platforms, most of their code
remain used by others), there's no need to handle !RCS_MASK() as
other platforms don't ever have fused-off render. Remove those code
paths and the special WA flag when initializing GuC.

Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Acked-by: default avatarTvrtko Ursulin <tursulin@ursulin.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20240320060543.4034215-7-lucas.demarchi@intel.com


Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 326e30e4

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

+2 −3
Original line number Diff line number Diff line
@@ -497,9 +497,8 @@ 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 && !RCS_MASK(engine->gt) &&

	     __ffs(CCS_MASK(engine->gt)) == engine->instance) ||

	     engine->class == RENDER_CLASS)

	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 */

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

+0 −4
Original line number Diff line number Diff line
@@ -315,10 +315,6 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) 
	if (IS_DG2_G11(gt->i915))

		flags |= GUC_WA_CONTEXT_ISOLATION;



	/* Wa_16015675438 */

	if (!RCS_MASK(gt))

		flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;



	/* Wa_14018913170 */

	if (GUC_FIRMWARE_VER(guc) >= MAKE_GUC_VER(70, 7, 0)) {

		if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915))