i915/perf: Remove code to update PWR_CLK_STATE for gen12

From Umesh Nerlige Ramappa
582b6c7dd019c49a239db5f721146139130251c4 in linux-6.6.y/6.6.45
4bc14b9cfaa2149d41baef2f2620e9f82d9847d7 in mainline linux

diff --git a/sys/dev/pci/drm/i915/i915_perf.c b/sys/dev/pci/drm/i915/i915_perf.c
index 5236810..df4850c 100644 (file)
--- a/sys/dev/pci/drm/i915/i915_perf.c
+++ b/sys/dev/pci/drm/i915/i915_perf.c
@@ -2803,26 +2803,6 @@ oa_configure_all_contexts(struct i915_perf_stream *stream,
        return 0;
 }
 
-static int
-gen12_configure_all_contexts(struct i915_perf_stream *stream,
-                            const struct i915_oa_config *oa_config,
-                            struct i915_active *active)
-{
-       struct flex regs[] = {
-               {
-                       GEN8_R_PWR_CLK_STATE(RENDER_RING_BASE),
-                       CTX_R_PWR_CLK_STATE,
-               },
-       };
-
-       if (stream->engine->class != RENDER_CLASS)
-               return 0;
-
-       return oa_configure_all_contexts(stream,
-                                        regs, ARRAY_SIZE(regs),
-                                        active);
-}
-
 static int
 lrc_configure_all_contexts(struct i915_perf_stream *stream,
                           const struct i915_oa_config *oa_config,
@@ -2929,7 +2909,6 @@ gen12_enable_metric_set(struct i915_perf_stream *stream,
 {
        struct drm_i915_private *i915 = stream->perf->i915;
        struct intel_uncore *uncore = stream->uncore;
-       struct i915_oa_config *oa_config = stream->oa_config;
        bool periodic = stream->periodic;
        u32 period_exponent = stream->period_exponent;
        u32 sqcnt1;
@@ -2973,15 +2952,6 @@ gen12_enable_metric_set(struct i915_perf_stream *stream,
 
        intel_uncore_rmw(uncore, GEN12_SQCNT1, 0, sqcnt1);
 
-       /*
-        * Update all contexts prior writing the mux configurations as we need
-        * to make sure all slices/subslices are ON before writing to NOA
-        * registers.
-        */
-       ret = gen12_configure_all_contexts(stream, oa_config, active);
-       if (ret)
-               return ret;
-
        /*
         * For Gen12, performance counters are context
         * saved/restored. Only enable it for the context that
@@ -3036,9 +3006,6 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)
                                   _MASKED_BIT_DISABLE(GEN12_DISABLE_DOP_GATING));
        }
 
-       /* Reset all contexts' slices/subslices configurations. */
-       gen12_configure_all_contexts(stream, NULL, NULL);
-
        /* disable the context save/restore or OAR counters */
        if (stream->ctx)
                gen12_configure_oar_context(stream, NULL);