drm/i915: Move Wa_16011163337 to gen12_ctx_workarounds_init()

This WA is needed in all gen12 platforms, moving it to
gen12_ctx_workarounds_init() allow us to remove the duplicated
implementation.
Also allow us to remove the tgl_ctx_workarounds_init() that after the
WA move above was empty.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324200502.1731265-4-lucas.demarchi@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 30b902fade1d96a05740f4ba69d30468f69996aa..38a2813220b9fa79325375c2af4a45564eaaeafd 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -657,12 +657,6 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
        wa_masked_field_set(wal, GEN8_CS_CHICKEN1,
                            GEN9_PREEMPT_GPGPU_LEVEL_MASK,
                            GEN9_PREEMPT_GPGPU_THREAD_GROUP_LEVEL);
-}
-
-static void tgl_ctx_workarounds_init(struct intel_engine_cs *engine,
-                                    struct i915_wa_list *wal)
-{
-       gen12_ctx_workarounds_init(engine, wal);
 
        /*
         * Wa_16011163337
@@ -689,17 +683,6 @@ static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,
        /* Wa_22010493298 */
        wa_masked_en(wal, HIZ_CHICKEN,
                     DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE);
-
-       /*
-        * Wa_16011163337
-        *
-        * Like in gen12_ctx_gt_tuning_init(), read verification is ignored due
-        * to Wa_1608008084.
-        */
-       wa_add(wal,
-              FF_MODE2,
-              FF_MODE2_GS_TIMER_MASK,
-              FF_MODE2_GS_TIMER_224, 0);
 }
 
 static void
@@ -716,9 +699,6 @@ __intel_engine_init_ctx_wa(struct intel_engine_cs *engine,
 
        if (IS_DG1(i915))
                dg1_ctx_workarounds_init(engine, wal);
-       else if (IS_ALDERLAKE_S(i915) || IS_ROCKETLAKE(i915) ||
-                IS_TIGERLAKE(i915))
-               tgl_ctx_workarounds_init(engine, wal);
        else if (IS_GEN(i915, 12))
                gen12_ctx_workarounds_init(engine, wal);
        else if (IS_GEN(i915, 11))