On Mon, 25 Mar 2024, Lucas De Marchi <lucas.demarchi@xxxxxxxxx> wrote:
> drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to
> the tree after solving a conflict. Remove it.
>
> Fixes: 326e30e4624c ("drm/i915: Drop dead code for pvc")
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Closes: https://lore.kernel.org/r/20240325083435.4f970eec@xxxxxxxxxxxxxxxx
> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> .../gpu/drm/i915/gt/intel_workarounds.c.rej | 18 ------------------
> 1 file changed, 18 deletions(-)
> delete mode 100644 drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej b/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
> deleted file mode 100644
> index 91463b1d684a..000000000000
> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -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)) {
--
Jani Nikula, Intel
