Update turbo (rps) min frequency for HSW/BDW
Subsystems (2)
cover Update turbo (rps) min frequency for HSW/BDW
From: Tom O'Rourke <Tom.O'[email protected]>
These patches update the turbo minimum frequency to match the values used for Windows and Android. The refactoring in Imre's recent series
"[Intel-gfx] [PATCH 0/8] sanitize RPS interrupt enabling/disabling" conflicts with these changes. Those conflicts should not be difficult to resolve.
Tom O'Rourke (2):
drm/i915: Use efficient frequency for HSW/BDW
drm/i915: Keep min freq above floor on HSW/BDW
drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: Use efficient frequency for HSW/BDW
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added hsw_use_efficient_freq() to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.
Also set the min_freq_softlimit to the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16
drivers/gpu/drm/i915/intel_pm.c +22 -0
@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv) +{ +u32 ddcc_status =0 ; +int ret; + + ret =sandybridge_pcode_read (dev_priv, +HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , + &ddcc_status); +if (0 == ret) + dev_priv->rps.efficient_freq = (ddcc_status >>8 ) &0xff ; +} +static void gen9_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -4765,6 +4777,11 @@ static void gen8_enable_rps(struct drm_device *dev) rp_state_cap =I915_READ (GEN6_RP_STATE_CAP );parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_BROADWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* 2b: Program RC6 thresholds.*/ I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */
@@ -4860,6 +4877,11 @@ static void gen6_enable_rps(struct drm_device *dev)parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_HASWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* disable the counters and set deterministic thresholds */ I915_WRITE (GEN6_RC_CONTROL ,0 );
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 44 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; }
drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4718
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv) +{ +u32 ddcc_status =0 ; +int ret; + + ret =sandybridge_pcode_read (dev_priv, +HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , + &ddcc_status); +if (0 == ret) + dev_priv->rps.efficient_freq = (ddcc_status >>8 ) &0xff ;
Control flow in the error case looks funny here - shouldn't we put the adjustment of the softlimit into the (ret == 0) case here to avoid putting garbage into it in case the pcode read falls over?
That would make the function name match reality a bit more too, since atm it just reads the efficient_freq but doesn't use it. So as-is a bit misnamed.
-Daniel
Quoted 36 lines
drivers/gpu/drm/i915/intel_pm.c +12
-0+} +static void gen9_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -4765,6 +4777,11 @@ static void gen8_enable_rps(struct drm_device *dev) rp_state_cap =I915_READ (GEN6_RP_STATE_CAP );parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_BROADWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* 2b: Program RC6 thresholds.*/ I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ @@ -4860,6 +4877,11 @@ static void gen6_enable_rps(struct drm_device *dev)parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_HASWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* disable the counters and set deterministic thresholds */ I915_WRITE (GEN6_RC_CONTROL ,0 );Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 45 lines · Daniel Vetter
Quoted 44 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; }
Quoted 15 lines
drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4718
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv) +{ +u32 ddcc_status =0 ; +int ret; + + ret =sandybridge_pcode_read (dev_priv, +HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , + &ddcc_status); +if (0 == ret) + dev_priv->rps.efficient_freq = (ddcc_status >>8 ) &0xff ;Control flow in the error case looks funny here - shouldn't we put the adjustment of the softlimit into the (ret == 0) case here to avoid putting garbage into it in case the pcode read falls over?
If the pcode read fails, the efficient_freq will not be set here and will still have the non-garbage value set in parse_rp_state_cap.
Quoted 5 lines
That would make the function name match reality a bit more too, since atm it just reads the
efficient_freqbut doesn't use it. So as-is a bit misnamed.
-Daniel
I agree the function is misnamed as-is. If there are no objections, I will rewrite the patch to follow Daniel's recommendation and move adjusting the softlimit to hsw_use_efficient_freq.
Quoted 29 lines
Quoted 29 lines
drivers/gpu/drm/i915/intel_pm.c +12
-0+} +static void gen9_enable_rps (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -4765,6 +4777,11 @@ static void gen8_enable_rps(struct drm_device *dev) rp_state_cap =I915_READ (GEN6_RP_STATE_CAP );parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_BROADWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* 2b: Program RC6 thresholds.*/ I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,40 <<16 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );/* 12500 * 1280ns */ @@ -4860,6 +4877,11 @@ static void gen6_enable_rps(struct drm_device *dev)parse_rp_state_cap (dev_priv, rp_state_cap); +if (IS_HASWELL (dev)) { +hsw_use_efficient_freq (dev_priv); + dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + } +/* disable the counters and set deterministic thresholds */ I915_WRITE (GEN6_RC_CONTROL ,0 );
Quoted 12 lines
Quoted 7 lines
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 11 lines · Tom
Quoted 10 lines · Daniel Vetter
drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4718
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +5
-0+ ret =sandybridge_pcode_read (dev_priv, +HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , + &ddcc_status); +if (0 == ret) + dev_priv->rps.efficient_freq = (ddcc_status >>8 ) &0xff ;Control flow in the error case looks funny here - shouldn't we put the adjustment of the softlimit into the (ret == 0) case here to avoid putting garbage into it in case the pcode read falls over?
Quoted 3 lines
If the pcode read fails, the
efficient_freqwill not be set here and will still have the non-garbage value set inparse_rp_state_cap.
Oh right I've missed this. Maybe update the XXX comment in that function and replace it with
/* Platforms which support special RP-efficient values will
* overwrite this in their setup fucntions, use rp1_freq as
* default. */
Cheers, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
In reply to Tom.O'[email protected]Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq() ?
Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq = rps_rpe_freq(dev_priv);
...
}
static in rps_rpe_freq(dev_priv)
{
/* By default, prefer the nominal frequency for efficiency */
int rpe = dev_priv->rps.rp1_freq;
if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) {
u32 ddcc_status = 0;
int ret;
/* Some useful and informative comment */
if (sandybridge_pcode_read(dev_priv,
HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL,
&ddcc_status) == 0)
rpe = (ddcc_status >> 8) & 0xff;
}
return rpe;}
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 49 lines · Chris Wilson
Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq()?
Quoted 9 lines
Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq=rps_rpe_freq(dev_priv);
...
}
The parse_rp_state_cap() function is for parsing the RP_STATE_CAP register. The pcode read to get the efficient frequency seems out of scope.
Quoted 18 lines
static in
rps_rpe_freq(dev_priv){ /* By default, prefer the nominal frequency for efficiency */ int rpe = dev_priv->rps.rp1_freq; if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv)) { u32 ddcc_status = 0; int ret; /* Some useful and informative comment */ if (sandybridge_pcode_read(dev_priv, HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL, &ddcc_status) == 0) rpe = (ddcc_status >> 8) & 0xff; } return rpe;
Quoted 4 lines
}
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 59 lines · Tom
Quoted 49 lines · Chris Wilson
Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq()?Quoted 9 lines
Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq=rps_rpe_freq(dev_priv);
...
}
Quoted 3 lines
The
parse_rp_state_cap()function is for parsing theRP_STATE_CAPregister. The pcode read to get the efficient frequency seems out of scope.
Rename it then. The function that sets rpe seems to be the ideal point to set rpe...
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 60 lines · Chris Wilson
Quoted 59 lines · Tom
Quoted 58 lines · Chris Wilson
Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq()?Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq=rps_rpe_freq(dev_priv);
...
}
Quoted 6 lines
Quoted 3 lines
The
parse_rp_state_cap()function is for parsing theRP_STATE_CAPregister. The pcode read to get the efficient frequency seems out of scope.Rename it then. The function that sets rpe seems to be the ideal point to set rpe...
Well reading the rpe value seems to be platforms specific. I think updating the comment as I've suggested is good enough, even when not really pretty.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 65 lines · Daniel Vetter
Quoted 64 lines · Chris Wilson
Quoted 62 lines · Tom
Quoted 49 lines · Chris Wilson
Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq()?Quoted 9 lines
Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq=rps_rpe_freq(dev_priv);
...
}The
parse_rp_state_cap()function is for parsing theRP_STATE_CAPregister. The pcode read to get the efficient frequency seems out of scope.
Quoted 6 lines
Quoted 2 lines
Rename it then. The function that sets rpe seems to be the ideal point to set rpe...
Well reading the rpe value seems to be platforms specific. I think updating the comment as I've suggested is good enough, even when not really pretty.
So why not add it to piece of platform specific code we already had for the rpe value?
Besides which the point that use_efficient_freq() is a poor function name seems to have fallen by the wayside.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915: Use efficient frequency for HSW/BDW
Quoted 73 lines · Chris Wilson
Quoted 65 lines · Daniel Vetter
Quoted 64 lines · Chris Wilson
Quoted 62 lines · Tom
Quoted 49 lines · Chris Wilson
Quoted 41 lines · On Wed, Nov 05, 2014 at 05:31:34PM -0800, Tom.O'[email protected] wrote:
From: Tom O'Rourke <Tom.O'[email protected]>
Updated gen6|8_enable_rps() for Haswell and Broadwell to use the efficient frequency read from pcode.
Added
hsw_use_efficient_freq()to read efficient frequency (aka RPe) from pcode. The efficiency is based on the frequency/power ratio (MHz/W); this is considering GT power and not package power. The efficent frequency is the highest frequency for which the frequency/power ratio is within some threshold of the highest frequency/power ratio.Also set the
min_freq_softlimitto the efficient frequency. A fixed decrease in frequency results in smaller decrease in power at frequencies less than RPe than at frequencies above RPe.Signed-off-by Tom O'Rourke <Tom.O'[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6010,6 +6010,7 @@ enum punit_power_well {#define GEN6_ENCODE_RC6_VID (mv) (((mv) - 245) / 5)#define GEN6_DECODE_RC6_VID (vids) (((vids) * 5) + 245)#define DISPLAY_IPS_CONTROL 0x19 +#define HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL 0x1A#define GEN6_PCODE_DATA 0x138128#define GEN6_PCODE_FREQ_IA_RATIO_SHIFT 8#define GEN6_PCODE_FREQ_RING_RATIO_SHIFT 16drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c · line 4709
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -4706,6 +4706,18 @@ static void parse_rp_state_cap(struct drm_i915_private *dev_priv, u32 rp_state_c dev_priv->rps.min_freq_softlimit = dev_priv->rps.min_freq; } +static void hsw_use_efficient_freq (struct drm_i915_private *dev_priv)
use_efficient_freq()?Quoted 9 lines
Shouldn't this be:
parse_rp_state_cap()
{
...
dev_priv->rps.efficient_freq=rps_rpe_freq(dev_priv);
...
}The
parse_rp_state_cap()function is for parsing theRP_STATE_CAPregister. The pcode read to get the efficient frequency seems out of scope.Quoted 6 lines
Quoted 2 lines
Rename it then. The function that sets rpe seems to be the ideal point to set rpe...
Well reading the rpe value seems to be platforms specific. I think updating the comment as I've suggested is good enough, even when not really pretty.
Quoted 5 lines
So why not add it to piece of platform specific code we already had for the rpe value?
Besides which the point that
use_efficient_freq()is a poor function name seems to have fallen by the wayside.
Ok I've actually looked at the code and vlv/chv is completely separate. So yeah I think best to drop the default value from parse_rp_state_cap, drop the use_efficient_freq func and just open-code stuff like in vlv with an if/else. Less code, less comments (no more XXX, yay!) and should be clearer.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Keep min freq above floor on HSW/BDW
In reply to Tom.O'[email protected]From: Tom O'Rourke <Tom.O'[email protected]>
Set the min_freq_softlimit to max(RPe, 450MHz).
Setting a floor can ensure a minimum experience level. The 450MHz value came from a power and performance study of various types of workloads (3D, Media, GPGPU, idle, etc).
--- drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -2
@@ -4779,7 +4779,8 @@ static void gen8_enable_rps(struct drm_device *dev)if (IS_BROADWELL (dev)) {hsw_use_efficient_freq (dev_priv); - dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + dev_priv->rps.min_freq_softlimit = +max (dev_priv->rps.efficient_freq, (u8 )9 );/* 450 MHz */ }/* 2b: Program RC6 thresholds.*/
@@ -4879,7 +4880,8 @@ static void gen6_enable_rps(struct drm_device *dev)if (IS_HASWELL (dev)) {hsw_use_efficient_freq (dev_priv); - dev_priv->rps.min_freq_softlimit = dev_priv->rps.efficient_freq; + dev_priv->rps.min_freq_softlimit = +max (dev_priv->rps.efficient_freq, (u8 )9 );/* 450 MHz */ }/* disable the counters and set deterministic thresholds */
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx