drm/i915: use i915_enable_rc6 on SNB too
Subsystems (2)
PATCH 1/1 drm/i915: use i915_enable_rc6 on SNB too
For debug & testing.
--- drivers/gpu/drm/i915/intel_display.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -3
@@ -6842,7 +6842,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv) {u32 rp_state_cap =I915_READ (GEN6_RP_STATE_CAP );u32 gt_perf_status =I915_READ (GEN6_GT_PERF_STATUS ); -u32 pcu_mbox; +u32 pcu_mbox, rc6_mask =0 ;int cur_freq, min_freq, max_freq;int i;
@@ -6873,9 +6873,12 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6p_THRESHOLD,100000 );I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ +if (i915_enable_rc6) + rc6_mask = GEN6_RC_CTL_RC6p_ENABLE | +GEN6_RC_CTL_RC6_ENABLE ; +I915_WRITE (GEN6_RC_CONTROL , - GEN6_RC_CTL_RC6p_ENABLE | -GEN6_RC_CTL_RC6_ENABLE | + rc6_mask |GEN6_RC_CTL_EI_MODE (1 ) |GEN6_RC_CTL_HW_ENABLE );
Signature · 1 line
1.7.1
drivers/gpu/drm/i915/intel_display.c void gen6_enable_rps(struct drm_i915_private *dev_priv) · line 6883
Quoted 12 lines · Jesse Barnes
For debug & testing.
Signed-off-by Jesse Barnes <[email protected]>---
drivers/gpu/drm/i915/intel_display.c +1
-2I915_WRITE (GEN6_RC_CONTROL , - GEN6_RC_CTL_RC6p_ENABLE | -GEN6_RC_CTL_RC6_ENABLE | + rc6_mask |GEN6_RC_CTL_EI_MODE (1 ) |GEN6_RC_CTL_HW_ENABLE );
Do you also need to set GEN6_RC_CTL_RC7_ENABLE if !i915_enable_rc6? I don't really know how the hardware works, but I had a similar untested patch except I added that bit in the rc6 disable case.
Otherwise, you can my r-b:
Quoted 6 lines · On Wed, 30 Mar 2011 14:32:51 -0700 Ben Widawsky <[email protected]> wrote:
Quoted 4 lines · Jesse Barnes
For debug & testing.
Signed-off-by Jesse Barnes <[email protected]>---
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c void gen6_enable_rps(struct drm_i915_private *dev_priv) · line 6883
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +1
-2I915_WRITE (GEN6_RC_CONTROL , - GEN6_RC_CTL_RC6p_ENABLE | -GEN6_RC_CTL_RC6_ENABLE | + rc6_mask |GEN6_RC_CTL_EI_MODE (1 ) |GEN6_RC_CTL_HW_ENABLE );Do you also need to set
GEN6_RC_CTL_RC7_ENABLEif !i915_enable_rc6? I don't really know how the hardware works, but I had a similar untested patch except I added that bit in the rc6 disable case.
That seems to control LLC way sharing between GT and the CPU; not sure if switching to an RC7 message is correct or not if RC6 is disabled though.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center