Ring frequency & Rpe changes for SKL
Subsystems (2)
cover Ring frequency & Rpe changes for SKL
From: Akash Goel <[email protected]>
This patch series adds the changes for supporting the Ring frequency table programming and retrieving the efficient frequency (aka RPe) value from the pcode for SKL.
Review comment from Rodrigo has been addressed & suggestion from Ville has been incorporated.
Akash Goel (5):
drm/i915/skl: Retrieve the Rpe value from Pcode drm/i915/skl: Ring frequency table programming changes drm/i915/skl: Restrict the ring frequency table programming to SKL drm/i915: Corrected the platform checks in i915_ring_freq_table
function
drm/i915/skl: Updated the i915_ring_freq_table debugfs function
drivers/gpu/drm/i915/i915_debugfs.c | 22 +++++++++++++++++----- drivers/gpu/drm/i915/intel_pm.c | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 13 deletions(-)
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/5 drm/i915/skl: Retrieve the Rpe value from Pcode
From: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.
Issue: VIZ-5143
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -2
@@ -4314,16 +4314,20 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) { ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status); -if (0 == ret) +if (0 == ret) { dev_priv->rps.efficient_freq =clamp_t (u8, ((ddcc_status >>8 ) &0xff ), dev_priv->rps.min_freq, dev_priv->rps.max_freq); + + dev_priv->rps.efficient_freq *= + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 ); + } } dev_priv->rps.idle_freq = dev_priv->rps.min_freq;
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915/skl: Retrieve the Rpe value from Pcode
I have no access to this documentation, but overall it makes sense from the units I saw so feel free to use:
Quoted 47 lines · On Sun, Jun 7, 2015 at 6:02 AM, <[email protected]> wrote:
From: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (
0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.Issue: VIZ-5143
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +6
-3@@ -4314,16 +4314,20 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) { ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status); -if (0 == ret) +if (0 == ret) { dev_priv->rps.efficient_freq =clamp_t (u8, ((ddcc_status >>8 ) &0xff ), dev_priv->rps.min_freq, dev_priv->rps.max_freq); + + dev_priv->rps.efficient_freq *= + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 ); + } } dev_priv->rps.idle_freq = dev_priv->rps.min_freq; --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/5] drm/i915/skl: Retrieve the Rpe value from Pcode
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4329
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +3
-0+ + dev_priv->rps.efficient_freq *= + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 );
This line seems awkward. I suppose a good compiler could optimize out the multiply by one.
I would prefer something like:
if(IS_SKYLAKE(dev)) dev_priv->rps.efficient_freq *= GEN9_FREQ_SCALER;
-- Tom O'Rourke
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 1/5] drm/i915/skl: Retrieve the Rpe value from Pcode
Quoted 11 lines · Tom
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4329
Quoted 3 lines
drivers/gpu/drm/i915/intel_pm.c +3
-0+ + dev_priv->rps.efficient_freq *= + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 );This line seems awkward. I suppose a good compiler could optimize out the multiply by one.
I would prefer something like:
if(IS_SKYLAKE(dev)) dev_priv->rps.efficient_freq *= GEN9_FREQ_SCALER;
Agreed,
Jani.
Quoted 6 lines
-- Tom O'Rourke
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/1 drm/i915/skl: Retrieve the Rpe value from Pcode
From: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.
v2: Replaced the conditional expression operator with 'if' statement (Tom)
Issue: VIZ-5143
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +6 -2
@@ -4314,16 +4314,20 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) { ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status); -if (0 == ret) +if (0 == ret) { dev_priv->rps.efficient_freq =clamp_t (u8, ((ddcc_status >>8 ) &0xff ), dev_priv->rps.min_freq, dev_priv->rps.max_freq); + +if (IS_SKYLAKE (dev)) + dev_priv->rps.efficient_freq *=GEN9_FREQ_SCALER ; + } } dev_priv->rps.idle_freq = dev_priv->rps.min_freq;
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/skl: Retrieve the Rpe value from Pcode
Quoted 25 lines · On Fri, Jun 12, 2015 at 03:01:08PM +0530, [email protected] wrote:
From: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (
0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.v2: Replaced the conditional expression operator with 'if' statement (Tom)
Issue: VIZ-5143
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -4314,16 +4314,20 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) {
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4326
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status); -if (0 == ret) +if (0 == ret) { dev_priv->rps.efficient_freq =clamp_t (u8, ((ddcc_status >>8 ) &0xff ), dev_priv->rps.min_freq, dev_priv->rps.max_freq);
That's wrong now since min/max_freq were already multiplied by GEN9_FREQ_SCALER.
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4331
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0+ +if (IS_SKYLAKE (dev)) + dev_priv->rps.efficient_freq *=GEN9_FREQ_SCALER ; + } }
I would suggest moving all the GEN9_FREQ_SCALER multiplications here.
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0dev_priv->rps.idle_freq = dev_priv->rps.min_freq;Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/skl: Retrieve the Rpe value from Pcode
Quoted 23 lines · Ville Syrjälä
Quoted 22 lines · On Fri, Jun 12, 2015 at 03:01:08PM +0530, [email protected] wrote:
From: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (
0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.v2: Replaced the conditional expression operator with 'if' statement (Tom)
Issue: VIZ-5143
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -4314,16 +4314,20 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq = dev_priv->rps.rp0_freq;
Quoted 16 lines
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4326
Quoted 13 lines
drivers/gpu/drm/i915/intel_pm.c +2
-2dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) { ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status); -if (0 == ret) +if (0 == ret) { dev_priv->rps.efficient_freq =clamp_t (u8, ((ddcc_status >>8 ) &0xff ), dev_priv->rps.min_freq, dev_priv->rps.max_freq);That's wrong now since min/max_freq were already multiplied by
GEN9_FREQ_SCALER.
Thanks for catching this issue. Sorry for the lapse.
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c static void gen6_init_rps_frequencies(struct drm_device *dev) · line 4331
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0+ +if (IS_SKYLAKE (dev)) + dev_priv->rps.efficient_freq *=GEN9_FREQ_SCALER ; + } }I would suggest moving all the
GEN9_FREQ_SCALERmultiplications here.
Fine this will be cleaner.
Can I do this movement as a part of this patch only ?
Best regards
Akash
Quoted 10 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0dev_priv->rps.idle_freq = dev_priv->rps.min_freq;Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/1 drm/i915/skl: Retrieve the Rpe value from Pcode
In reply to Ville SyrjäläFrom: Akash Goel <[email protected]>
Read the efficient frequency (aka RPe) value through the the mailbox command (0x1A) from the pcode, as done on Haswell and Broadwell. The turbo minimum frequency softlimit is not revised as per the efficient frequency value.
v2: Replaced the conditional expression operator with 'if' statement (Tom)
v3: Corrected the derivation of efficient frequency & shifted the
GEN9_FREQ_SCALER multiplications downwards (Ville)
Issue: VIZ-5143
--- drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +11 -8
@@ -4303,18 +4303,11 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.rp0_freq = (rp_state_cap >>0 ) &0xff ; dev_priv->rps.rp1_freq = (rp_state_cap >>8 ) &0xff ; dev_priv->rps.min_freq = (rp_state_cap >>16 ) &0xff ; -if (IS_SKYLAKE (dev)) { -/* Store the frequency values in 16.66 MHZ units, which is -the natural hardware unit for SKL */ - dev_priv->rps.rp0_freq *=GEN9_FREQ_SCALER ; - dev_priv->rps.rp1_freq *=GEN9_FREQ_SCALER ; - dev_priv->rps.min_freq *=GEN9_FREQ_SCALER ; - }/* hw_max = RP0 until we check for overclocking */ dev_priv->rps.max_freq = dev_priv->rps.rp0_freq; dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq; -if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { +if (IS_HASWELL (dev) ||IS_BROADWELL (dev) ||IS_SKYLAKE (dev)) { ret =sandybridge_pcode_read (dev_priv,HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL , &ddcc_status);
@@ -4326,6 +4319,16 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) dev_priv->rps.max_freq); } +if (IS_SKYLAKE (dev)) { +/* Store the frequency values in 16.66 MHZ units, which is +the natural hardware unit for SKL */ + dev_priv->rps.rp0_freq *=GEN9_FREQ_SCALER ; + dev_priv->rps.rp1_freq *=GEN9_FREQ_SCALER ; + dev_priv->rps.min_freq *=GEN9_FREQ_SCALER ; + dev_priv->rps.max_freq *=GEN9_FREQ_SCALER ; + dev_priv->rps.efficient_freq *=GEN9_FREQ_SCALER ; + } + dev_priv->rps.idle_freq = dev_priv->rps.min_freq;/* Preserve min/max settings in case of re-init */
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3] drm/i915/skl: Retrieve the Rpe value from Pcode
Task id: 6601 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 302/302 302/302 SNB 312/316 312/316 IVB 343/343 343/343
BYT -1 287/287 286/287
HSW 380/380 380/380
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*BYT igt@gem_partial_pwrite_pread@reads-display PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915/skl: Retrieve the Rpe value from Pcode
In reply to [email protected]Task id: 6562 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK 303/303 303/303 SNB 312/312 312/312 IVB 343/343 343/343 BYT 284/284 284/284 HSW 380/380 380/380
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/5 drm/i915/skl: Ring frequency table programming changes
In reply to [email protected]From: Akash Goel <[email protected]>
Ring frequency table programming changes for SKL. No need for a floor on ring frequency, as the issue of performance impact with ring running below DDR frequency, is believed to be fixed on SKL
v2: Removed the check for avoiding ring frequency programming for BXT (Rodrigo)
Issue: VIZ-5144
--- drivers/gpu/drm/i915/intel_pm.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +19 -4
@@ -4622,6 +4622,7 @@ static void __gen6_update_ring_freq(struct drm_device *dev)int min_freq =15 ;unsigned int gpu_freq;unsigned int max_ia_freq, min_ring_freq; +unsigned int max_gpu_freq, min_gpu_freq;int scaling_factor =180 ;struct cpufreq_policy *policy;
@@ -4646,17 +4647,31 @@ static void __gen6_update_ring_freq(struct drm_device *dev)/* convert DDR frequency from units of 266.6MHz to bandwidth */ min_ring_freq =mult_frac (min_ring_freq,8 ,3 ); +if (IS_SKYLAKE (dev)) { +/* Convert GT frequency to 50 HZ units */ + min_gpu_freq = dev_priv->rps.min_freq /GEN9_FREQ_SCALER ; + max_gpu_freq = dev_priv->rps.max_freq /GEN9_FREQ_SCALER ; + }else { + min_gpu_freq = dev_priv->rps.min_freq; + max_gpu_freq = dev_priv->rps.max_freq; + } +/* * For each potential GPU frequency, load a ring frequency we'd like * to use for memory access. We do this by specifying the IA frequency * the PCU should use as a reference to determine the ring frequency. */ -for (gpu_freq = dev_priv->rps.max_freq; gpu_freq >= dev_priv->rps.min_freq; - gpu_freq--) { -int diff = dev_priv->rps.max_freq - gpu_freq; +for (gpu_freq = max_gpu_freq; gpu_freq >= min_gpu_freq; gpu_freq--) { +int diff = max_gpu_freq - gpu_freq;unsigned int ia_freq =0 , ring_freq =0 ; -if (INTEL_INFO (dev)->gen >=8 ) { +if (IS_SKYLAKE (dev)) { +/* +* ring_freq = 2 * GT. ring_freq is in 100MHz units +* No floor required for ring frequency on SKL. +*/ + ring_freq = gpu_freq; + }else if (INTEL_INFO (dev)->gen >=8 ) {/* max(2 * GT, DDR). NB: GT is 50MHz units */ ring_freq =max (min_ring_freq, gpu_freq); }else if (IS_HASWELL (dev)) {
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/5] drm/i915/skl: Ring frequency table programming changes
Quoted 7 lines · On Sun, Jun 7, 2015 at 6:02 AM, <[email protected]> wrote:
From: Akash Goel <[email protected]>
Ring frequency table programming changes for SKL. No need for a floor on ring frequency, as the issue of performance impact with ring running below DDR frequency, is believed to be fixed on SKL
v2: Removed the check for avoiding ring frequency programming for BXT (Rodrigo)
thanks
Quoted 62 lines
Issue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +19
-5@@ -4622,6 +4622,7 @@ static void __gen6_update_ring_freq(struct drm_device *dev)int min_freq =15 ;unsigned int gpu_freq;unsigned int max_ia_freq, min_ring_freq; +unsigned int max_gpu_freq, min_gpu_freq;int scaling_factor =180 ;struct cpufreq_policy *policy;@@ -4646,17 +4647,31 @@ static void __gen6_update_ring_freq(struct drm_device *dev)/* convert DDR frequency from units of 266.6MHz to bandwidth */ min_ring_freq =mult_frac (min_ring_freq,8 ,3 ); +if (IS_SKYLAKE (dev)) { +/* Convert GT frequency to 50 HZ units */ + min_gpu_freq = dev_priv->rps.min_freq /GEN9_FREQ_SCALER ; + max_gpu_freq = dev_priv->rps.max_freq /GEN9_FREQ_SCALER ; + }else { + min_gpu_freq = dev_priv->rps.min_freq; + max_gpu_freq = dev_priv->rps.max_freq; + } +/* * For each potential GPU frequency, load a ring frequency we'd like * to use for memory access. We do this by specifying the IA frequency * the PCU should use as a reference to determine the ring frequency. */ -for (gpu_freq = dev_priv->rps.max_freq; gpu_freq >= dev_priv->rps.min_freq; - gpu_freq--) { -int diff = dev_priv->rps.max_freq - gpu_freq; +for (gpu_freq = max_gpu_freq; gpu_freq >= min_gpu_freq; gpu_freq--) { +int diff = max_gpu_freq - gpu_freq;unsigned int ia_freq =0 , ring_freq =0 ; -if (INTEL_INFO (dev)->gen >=8 ) { +if (IS_SKYLAKE (dev)) { +/* +* ring_freq = 2 * GT. ring_freq is in 100MHz units +* No floor required for ring frequency on SKL. +*/ + ring_freq = gpu_freq; + }else if (INTEL_INFO (dev)->gen >=8 ) {/* max(2 * GT, DDR). NB: GT is 50MHz units */ ring_freq =max (min_ring_freq, gpu_freq); }else if (IS_HASWELL (dev)) { --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915/skl: Restrict the ring frequency table programming to SKL
In reply to [email protected]From: Akash Goel <[email protected]>
Ring frequency table programming is not required on BXT. Added separate checks to enable the programming only for SKL & skip for BXT.
Issue: VIZ-5144
--- drivers/gpu/drm/i915/intel_pm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +3 -2
@@ -4705,7 +4705,7 @@ void gen6_update_ring_freq(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <6 ||IS_VALLEYVIEW (dev)) +if (INTEL_INFO (dev)->gen <6 ||IS_VALLEYVIEW (dev) ||IS_BROXTON (dev))return ;mutex_lock (&dev_priv->rps.hw_lock);
@@ -5820,7 +5820,8 @@ static void intel_gen6_powersave_work(struct work_struct *work) }else if (INTEL_INFO (dev)->gen >=9 ) {gen9_enable_rc6 (dev);gen9_enable_rps (dev); -__gen6_update_ring_freq (dev); +if (IS_SKYLAKE (dev)) +__gen6_update_ring_freq (dev); }else if (IS_BROADWELL (dev)) {gen8_enable_rps (dev);__gen6_update_ring_freq (dev);
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/5] drm/i915/skl: Restrict the ring frequency table programming to SKL
thanks
Quoted 41 lines · On Sun, Jun 7, 2015 at 6:02 AM, <[email protected]> wrote:
From: Akash Goel <[email protected]>
Ring frequency table programming is not required on BXT. Added separate checks to enable the programming only for SKL & skip for BXT.
Issue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -4705,7 +4705,7 @@ void gen6_update_ring_freq(struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (INTEL_INFO (dev)->gen <6 ||IS_VALLEYVIEW (dev)) +if (INTEL_INFO (dev)->gen <6 ||IS_VALLEYVIEW (dev) ||IS_BROXTON (dev))return ;mutex_lock (&dev_priv->rps.hw_lock);@@ -5820,7 +5820,8 @@ static void intel_gen6_powersave_work(struct work_struct *work) }else if (INTEL_INFO (dev)->gen >=9 ) {gen9_enable_rc6 (dev);gen9_enable_rps (dev); -__gen6_update_ring_freq (dev); +if (IS_SKYLAKE (dev)) +__gen6_update_ring_freq (dev); }else if (IS_BROADWELL (dev)) {gen8_enable_rps (dev);__gen6_update_ring_freq (dev); --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/5 drm/i915: Corrected the platform checks in i915_ring_freq_table function
In reply to [email protected]From: Akash Goel <[email protected]>
Corrected the platform checks in i915_ring_freq_table debugfs function so as to allow the read of ring frequency table for BDW and disallow for VLV
Issue: VIZ-5144
--- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -1
@@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)int ret =0 ;int gpu_freq, ia_freq; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) { +if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || +IS_BROADWELL (dev))) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/5] drm/i915: Corrected the platform checks in i915_ring_freq_table function
I'd prefer 2 separated patches, but seems correct anyway so:
Quoted 32 lines · On Sun, Jun 7, 2015 at 6:02 AM, <[email protected]> wrote:
From: Akash Goel <[email protected]>
Corrected the platform checks in
i915_ring_freq_tabledebugfs function so as to allow the read of ring frequency table for BDW and disallow for VLVIssue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +2
-2@@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)int ret =0 ;int gpu_freq, ia_freq; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) { +if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || +IS_BROADWELL (dev))) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; } --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/5] drm/i915: Corrected the platform checks in i915_ring_freq_table function
In reply to [email protected]Quoted 16 lines · On Sun, Jun 07, 2015 at 06:32:23PM +0530, [email protected] wrote:
From: Akash Goel <[email protected]>
Corrected the platform checks in
i915_ring_freq_tabledebugfs function so as to allow the read of ring frequency table for BDW and disallow for VLVIssue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_ring_freq_table(struct seq_file *m, void *unused) · line 1783
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)int ret =0 ;int gpu_freq, ia_freq; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) { +if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || +IS_BROADWELL (dev))) {
This is really hard to read with the double negation. What about
if (gen < 6 || IS_VLV(dev)) /* not supported */
instaed? Presuming I decoded this correctly ...
-Daniel
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0seq_puts (m,"unsupported on this chipset\n" );return 0 ; }Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/5] drm/i915: Corrected the platform checks in i915_ring_freq_table function
Quoted 26 lines · Daniel Vetter
Quoted 16 lines · On Sun, Jun 07, 2015 at 06:32:23PM +0530, [email protected] wrote:
From: Akash Goel <[email protected]>
Corrected the platform checks in
i915_ring_freq_tabledebugfs function so as to allow the read of ring frequency table for BDW and disallow for VLVIssue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c static int i915_ring_freq_table(struct seq_file *m, void *unused) · line 1783
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-1@@ -1779,7 +1779,8 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)int ret =0 ;int gpu_freq, ia_freq; -if (!(IS_GEN6 (dev) ||IS_GEN7 (dev))) { +if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || +IS_BROADWELL (dev))) {This is really hard to read with the double negation. What about
Quoted 4 lines
if (gen < 6 || IS_VLV(dev)) /* not supported */instaed? Presuming I decoded this correctly ...
Yes this way also it is fine. Will make this change.
Accordingly the next patch will also change, like this
if (gen < 6 || IS_VLV(dev) || IS_BROXTON(dev)) /* not supported */
Best regards
Akash
Quoted 12 lines
-Daniel
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0seq_puts (m,"unsupported on this chipset\n" );return 0 ; }Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 drm/i915/skl: Updated the i915_ring_freq_table debugfs function
In reply to [email protected]From: Akash Goel <[email protected]>
Updated the i915_ring_freq_table debugfs function to support the read of ring frequency table, through Punit interface, for SKL also.
Issue: VIZ-5144
--- drivers/gpu/drm/i915/i915_debugfs.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +16 -5
@@ -1778,9 +1778,10 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)struct drm_i915_private *dev_priv = dev->dev_private;int ret =0 ;int gpu_freq, ia_freq; +unsigned int max_gpu_freq, min_gpu_freq;if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || -IS_BROADWELL (dev))) { +IS_BROADWELL (dev) ||IS_SKYLAKE (dev))) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }
@@ -1793,17 +1794,27 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; +if (IS_SKYLAKE (dev)) { +/* Convert GT frequency to 50 HZ units */ + min_gpu_freq = + dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ; + max_gpu_freq = + dev_priv->rps.max_freq_softlimit /GEN9_FREQ_SCALER ; + }else { + min_gpu_freq = dev_priv->rps.min_freq_softlimit; + max_gpu_freq = dev_priv->rps.max_freq_softlimit; + } +seq_puts (m,"GPU freq (MHz)\tEffective CPU freq (MHz)\tEffective Ring freq (MHz)\n" ); -for (gpu_freq = dev_priv->rps.min_freq_softlimit; - gpu_freq <= dev_priv->rps.max_freq_softlimit; - gpu_freq++) { +for (gpu_freq = min_gpu_freq; gpu_freq <= max_gpu_freq; gpu_freq++) { ia_freq = gpu_freq;sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_MIN_FREQ_TABLE , &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" , -intel_gpu_freq (dev_priv, gpu_freq), +intel_gpu_freq (dev_priv, (gpu_freq * + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 ); }
Signature · 6 lines
1.9.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/5] drm/i915/skl: Updated the i915_ring_freq_table debugfs function
Quoted 66 lines · On Sun, Jun 7, 2015 at 6:02 AM, <[email protected]> wrote:
From: Akash Goel <[email protected]>
Updated the
i915_ring_freq_tabledebugfs function to support the read of ring frequency table, through Punit interface, for SKL also.Issue: VIZ-5144
Signed-off-by Akash Goel <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +16
-6@@ -1778,9 +1778,10 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)struct drm_i915_private *dev_priv = dev->dev_private;int ret =0 ;int gpu_freq, ia_freq; +unsigned int max_gpu_freq, min_gpu_freq;if (!(IS_GEN6 (dev) || (IS_GEN7 (dev) && !IS_VALLEYVIEW (dev)) || -IS_BROADWELL (dev))) { +IS_BROADWELL (dev) ||IS_SKYLAKE (dev))) {seq_puts (m,"unsupported on this chipset\n" );return 0 ; }@@ -1793,17 +1794,27 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)if (ret) goto out; +if (IS_SKYLAKE (dev)) { +/* Convert GT frequency to 50 HZ units */ + min_gpu_freq = + dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ; + max_gpu_freq = + dev_priv->rps.max_freq_softlimit /GEN9_FREQ_SCALER ; + }else { + min_gpu_freq = dev_priv->rps.min_freq_softlimit; + max_gpu_freq = dev_priv->rps.max_freq_softlimit; + } +seq_puts (m,"GPU freq (MHz)\tEffective CPU freq (MHz)\tEffective Ring freq (MHz)\n" ); -for (gpu_freq = dev_priv->rps.min_freq_softlimit; - gpu_freq <= dev_priv->rps.max_freq_softlimit; - gpu_freq++) { +for (gpu_freq = min_gpu_freq; gpu_freq <= max_gpu_freq; gpu_freq++) { ia_freq = gpu_freq;sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_MIN_FREQ_TABLE , &ia_freq);seq_printf (m,"%d\t\t%d\t\t\t\t%d\n" , -intel_gpu_freq (dev_priv, gpu_freq), +intel_gpu_freq (dev_priv, (gpu_freq * + (IS_SKYLAKE (dev) ?GEN9_FREQ_SCALER :1 ))), ((ia_freq >>0 ) &0xff ) *100 , ((ia_freq >>8 ) &0xff ) *100 ); } --1.9.2
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Rodrigo Vivi Blog: http://blog.vivi.eng.br _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx