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

drm/i915: Delete stray .rej file 



drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to
the tree after solving a conflict. Remove it.

Fixes: 326e30e4 ("drm/i915: Drop dead code for pvc")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20240325083435.4f970eec@canb.auug.org.au


Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240325144728.537855-1-lucas.demarchi@intel.com


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

drivers/gpu/drm/i915/gt/intel_workarounds.c.rej

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
diff a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c	(rejected hunks)

@@ -2844,14 +2767,13 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li

 

 	if (IS_GFX_GT_IP_STEP(gt, IP_VER(12, 70), STEP_A0, STEP_B0) ||

 	    IS_GFX_GT_IP_STEP(gt, IP_VER(12, 71), STEP_A0, STEP_B0) ||

-	    IS_PONTEVECCHIO(i915) ||

 	    IS_DG2(i915)) {

 		/* Wa_22014226127 */

 		wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0, DISABLE_D8_D16_COASLESCE);

 	}

 

-	if (IS_PONTEVECCHIO(i915) || IS_DG2(i915))

-		/* Wa_14015227452:dg2,pvc */

+	if (IS_DG2(i915))

+		/* Wa_14015227452 */

 		wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN4, XEHP_DIS_BBL_SYSPIPE);

 

 	if (IS_DG2(i915)) {