Commit 371aba6e authored by Lionel Landwerlin's avatar Lionel Landwerlin

drm/i915/perf: remove redundant power configuration register override

The caller of i915_oa_init_reg_state() already sets this.
Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200317132222.2638719-2-lionel.g.landwerlin@intel.com
parent 9aba9c18
...@@ -2098,9 +2098,6 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce, ...@@ -2098,9 +2098,6 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,
for (i = 0; i < ARRAY_SIZE(flex_regs); i++) for (i = 0; i < ARRAY_SIZE(flex_regs); i++)
reg_state[ctx_flexeu0 + i * 2 + 1] = reg_state[ctx_flexeu0 + i * 2 + 1] =
oa_config_flex_reg(stream->oa_config, flex_regs[i]); oa_config_flex_reg(stream->oa_config, flex_regs[i]);
reg_state[CTX_R_PWR_CLK_STATE] =
intel_sseu_make_rpcs(ce->engine->i915, &ce->sseu);
} }
struct flex { struct flex {
...@@ -2906,10 +2903,6 @@ void i915_oa_init_reg_state(const struct intel_context *ce, ...@@ -2906,10 +2903,6 @@ void i915_oa_init_reg_state(const struct intel_context *ce,
/* perf.exclusive_stream serialised by lrc_configure_all_contexts() */ /* perf.exclusive_stream serialised by lrc_configure_all_contexts() */
stream = READ_ONCE(engine->i915->perf.exclusive_stream); stream = READ_ONCE(engine->i915->perf.exclusive_stream);
/*
* For gen12, only CTX_R_PWR_CLK_STATE needs update, but the caller
* is already doing that, so nothing to be done for gen12 here.
*/
if (stream && INTEL_GEN(stream->perf->i915) < 12) if (stream && INTEL_GEN(stream->perf->i915) < 12)
gen8_update_reg_state_unlocked(ce, stream); gen8_update_reg_state_unlocked(ce, stream);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment