drm/i915: Clean up the ring scaling calculations
Subsystems (2)
PATCH 1/1 drm/i915: Clean up the ring scaling calculations
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.
2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use mult_frac instead of magic math.
The patches should yield no difference in the end.
This helps for future platform enabling.
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -4
@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq = (min_ring_freq,2 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like
@@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (ring_freq,1 ,3 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {
Signature · 1 line
1.8.4
PATCH v2 1/1 drm/i915: Clean up the ring scaling calculations
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.
2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use mult_frac instead of magic math.
This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -4
@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like
@@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (gpu_freq,4 ,3 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {
Signature · 1 line
1.8.4
PATCH v3 1/1 drm/i915: Clean up the ring scaling calculations
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.
2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use mult_frac instead of magic math.
This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
v3: Use 1.25 instead of 1.33 as the original code did. (Jesse)
--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +4 -4
@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like
@@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (gpu_freq,5 ,4 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {
Signature · 1 line
1.8.4
Quoted 43 lines · On Wed, 2 Oct 2013 09:25:02 -0700 Ben Widawsky <[email protected]>…
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use
mult_fracinstead of magic math.This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
v3: Use 1.25 instead of 1.33 as the original code did. (Jesse)
CC Jesse Barnes <[email protected]>CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like
drivers/gpu/drm/i915/intel_pm.c void gen6_update_ring_freq(struct drm_device *dev) · line 3684
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (gpu_freq,5 ,4 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {
Daniel Vetter
AppliedQuoted 48 lines · Jesse Barnes
Quoted 45 lines · On Wed, 2 Oct 2013 09:25:02 -0700 Ben Widawsky <[email protected]>…
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use
mult_fracinstead of magic math.This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
v3: Use 1.25 instead of 1.33 as the original code did. (Jesse)
CC Jesse Barnes <[email protected]>CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like @@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c void gen6_update_ring_freq(struct drm_device *dev) · line 3684
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (gpu_freq,5 ,4 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {Reviewed-by Jesse Barnes <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 4 lines · Ben Widawsky
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.
Confirmed by inspection, units are 266MHz.
Quoted 25 lines
2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use
mult_fracinstead of magic math.This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
v3: Use 1.25 instead of 1.33 as the original code did. (Jesse)
CC Jesse Barnes <[email protected]>CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c void gen6_update_ring_freq(struct drm_device *dev) · line 3668
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );
mult_frac() does not round upwards, so that will be a potential, but small, difference.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 41 lines · On Tue, 1 Oct 2013 15:32:38 -0700 Ben Widawsky <[email protected]>…
This patch attempts to clean up the ring/IA scaling programming in the following ways.
1. Fix the comment about the DDR frequency. The math is 266MHz, not 133MHz. Formula was right, docs are wrong.2. Mask the DCLK register since I don't know how it is defined on future platforms.
3. use
mult_fracinstead of magic math.This helps for future platform enabling.
v2: Actually use the right patch. The v1 was a mix of things, none of which was right. Note that due to rounding, we actually get different values (slightly higher) for the effective ring frequency.
CC Jesse Barnes <[email protected]>CC Chris Wilson <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +3
-3@@ -3663,9 +3663,9 @@ void gen6_update_ring_freq(struct drm_device *dev)/* Convert from kHz to MHz */ max_ia_freq /=1000 ; - min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ); -/* convert DDR frequency from units of 133.3MHz to bandwidth */ - min_ring_freq = (2 *4 * min_ring_freq +2 ) /3 ; + min_ring_freq =I915_READ (MCHBAR_MIRROR_BASE_SNB +DCLK ) &0xf ; +/* convert DDR frequency from units of 266.6MHz to bandwidth */ + min_ring_freq =mult_frac (min_ring_freq,8 ,3 );/* * For each potential GPU frequency, load a ring frequency we'd like
drivers/gpu/drm/i915/intel_pm.c void gen6_update_ring_freq(struct drm_device *dev) · line 3684
Quoted 8 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -3678,7 +3678,7 @@ void gen6_update_ring_freq(struct drm_device *dev)unsigned int ia_freq =0 , ring_freq =0 ;if (IS_HASWELL (dev)) { - ring_freq = (gpu_freq *5 +3 ) /4 ; + ring_freq =mult_frac (gpu_freq,4 ,3 ); ring_freq =max (min_ring_freq, ring_freq);/* leave ia_freq as the default, chosen by cpufreq */ }else {
Seems like the second mult_frac should be 5,4 rather than 4,3, to match the original calculation?