@@ -2748,26 +2748,6 @@ oa_configure_all_contexts(struct i915_perf_stream *stream,
2748
2748
return 0 ;
2749
2749
}
2750
2750
2751
- static int
2752
- gen12_configure_all_contexts (struct i915_perf_stream * stream ,
2753
- const struct i915_oa_config * oa_config ,
2754
- struct i915_active * active )
2755
- {
2756
- struct flex regs [] = {
2757
- {
2758
- GEN8_R_PWR_CLK_STATE (RENDER_RING_BASE ),
2759
- CTX_R_PWR_CLK_STATE ,
2760
- },
2761
- };
2762
-
2763
- if (stream -> engine -> class != RENDER_CLASS )
2764
- return 0 ;
2765
-
2766
- return oa_configure_all_contexts (stream ,
2767
- regs , ARRAY_SIZE (regs ),
2768
- active );
2769
- }
2770
-
2771
2751
static int
2772
2752
lrc_configure_all_contexts (struct i915_perf_stream * stream ,
2773
2753
const struct i915_oa_config * oa_config ,
@@ -2874,7 +2854,6 @@ gen12_enable_metric_set(struct i915_perf_stream *stream,
2874
2854
{
2875
2855
struct drm_i915_private * i915 = stream -> perf -> i915 ;
2876
2856
struct intel_uncore * uncore = stream -> uncore ;
2877
- struct i915_oa_config * oa_config = stream -> oa_config ;
2878
2857
bool periodic = stream -> periodic ;
2879
2858
u32 period_exponent = stream -> period_exponent ;
2880
2859
u32 sqcnt1 ;
@@ -2918,15 +2897,6 @@ gen12_enable_metric_set(struct i915_perf_stream *stream,
2918
2897
2919
2898
intel_uncore_rmw (uncore , GEN12_SQCNT1 , 0 , sqcnt1 );
2920
2899
2921
- /*
2922
- * Update all contexts prior writing the mux configurations as we need
2923
- * to make sure all slices/subslices are ON before writing to NOA
2924
- * registers.
2925
- */
2926
- ret = gen12_configure_all_contexts (stream , oa_config , active );
2927
- if (ret )
2928
- return ret ;
2929
-
2930
2900
/*
2931
2901
* For Gen12, performance counters are context
2932
2902
* saved/restored. Only enable it for the context that
@@ -2980,9 +2950,6 @@ static void gen12_disable_metric_set(struct i915_perf_stream *stream)
2980
2950
_MASKED_BIT_DISABLE (GEN12_DISABLE_DOP_GATING ));
2981
2951
}
2982
2952
2983
- /* Reset all contexts' slices/subslices configurations. */
2984
- gen12_configure_all_contexts (stream , NULL , NULL );
2985
-
2986
2953
/* disable the context save/restore or OAR counters */
2987
2954
if (stream -> ctx )
2988
2955
gen12_configure_oar_context (stream , NULL );
0 commit comments