Skip to content

Commit

Permalink
drm/i915/perf: remove redundant power configuration register override
Browse files Browse the repository at this point in the history
The caller of i915_oa_init_reg_state() already sets this.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200317132222.2638719-2-lionel.g.landwerlin@intel.com
  • Loading branch information
Lionel Landwerlin committed Mar 17, 2020
1 parent 9aba9c1 commit 371aba6
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/gpu/drm/i915/i915_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2098,9 +2098,6 @@ gen8_update_reg_state_unlocked(const struct intel_context *ce,
for (i = 0; i < ARRAY_SIZE(flex_regs); i++)
reg_state[ctx_flexeu0 + i * 2 + 1] =
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 {
Expand Down Expand Up @@ -2906,10 +2903,6 @@ void i915_oa_init_reg_state(const struct intel_context *ce,

/* perf.exclusive_stream serialised by lrc_configure_all_contexts() */
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)
gen8_update_reg_state_unlocked(ce, stream);
}
Expand Down

0 comments on commit 371aba6

Please sign in to comment.