Enable RP1/RPn/RP0 sysfs and enable CHV PM interrupt
Subsystems (2)
cover Enable RP1/RPn/RP0 sysfs and enable CHV PM interrupt
From: Deepak S <[email protected]>
Enable RP1/RPn/RP0 sysfs and enable CHV PM interrupt for verifying the freq on VLV and CHV
Deepak S (7):
drm/i915: Read guaranteed freq for valleyview drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs drm/i915: keep freq/opcode conversion function more generic drm/i915: populate mem_freq/cz_clock for chv drm/i915: CHV GPU frequency to opcode functions drm/i915/chv: Add basic PM interrupt support for CHV drm/i915: Add RP1 render P state thresholds in CHV
drivers/gpu/drm/i915/i915_debugfs.c | 14 +-- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 6 ++ drivers/gpu/drm/i915/i915_sysfs.c | 30 +++++-- drivers/gpu/drm/i915/intel_pm.c | 164 +++++++++++++++++++++++++++++++++--- 6 files changed, 189 insertions(+), 32 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/7 drm/i915: Read guaranteed freq for valleyview
From: Deepak S <[email protected]>
Reading RP1 for valleyview to help us enable "pm_rps" i-g-t testcase execution.
--- drivers/gpu/drm/i915/intel_pm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +16 -0
@@ -3816,6 +3816,17 @@ int cherryview_rps_min_freq(struct drm_i915_private *dev_priv)return rpn; } +int valleyview_rps_guar_freq (struct drm_i915_private *dev_priv) +{ +u32 val, rp1; + + val =vlv_nc_read (dev_priv,IOSF_NC_FB_GFX_FREQ_FUSE ); + + rp1 = (val &FB_GFX_FGUARANTEED_FREQ_FUSE_MASK ) >>FB_GFX_FGUARANTEED_FREQ_FUSE_SHIFT ; + +return rp1; +} +int valleyview_rps_max_freq (struct drm_i915_private *dev_priv) {u32 val, rp0;
@@ -3958,6 +3969,11 @@ static void valleyview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =valleyview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =valleyview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),
Signature · 1 line
1.9.1
PATCH 2/7 drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs
In reply to [email protected]From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
--- drivers/gpu/drm/i915/i915_sysfs.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_sysfs.c +15 -3
@@ -461,11 +461,20 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrmutex_unlock (&dev->struct_mutex);if (attr == &dev_attr_gt_RP0_freq_mhz) { - val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); +else + val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) { - val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); +else + val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) { - val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); +else + val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {BUG (); }
@@ -486,6 +495,9 @@ static const struct attribute *vlv_attrs[] = { &dev_attr_gt_cur_freq_mhz.attr, &dev_attr_gt_max_freq_mhz.attr, &dev_attr_gt_min_freq_mhz.attr, + &dev_attr_gt_RP0_freq_mhz.attr, + &dev_attr_gt_RP1_freq_mhz.attr, + &dev_attr_gt_RPn_freq_mhz.attr, &dev_attr_vlv_rpe_freq_mhz.attr, NULL, };
Signature · 1 line
1.9.1
PATCH 3/7 drm/i915: keep freq/opcode conversion function more generic
In reply to [email protected]From: Deepak S <[email protected]>
Since freq/encode conversion formula changes from platform to platform, create a generic wrapper function and having platform check inside this help to simpilfy adding newer platform freq/opcode conversion.
--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++----- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -7
@@ -1140,14 +1140,14 @@ static int i915_frequency_info(struct seq_file *m, void *unused) val =valleyview_rps_max_freq (dev_priv);seq_printf (m,"max GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val)); val =valleyview_rps_min_freq (dev_priv);seq_printf (m,"min GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));seq_printf (m,"current GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff )); +intel_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff ));mutex_unlock (&dev_priv->rps.hw_lock); }else {seq_puts (m,"no P-state info available\n" );
@@ -3667,7 +3667,7 @@ i915_max_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else *val = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);
@@ -3698,7 +3698,7 @@ i915_max_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go above the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);
@@ -3748,7 +3748,7 @@ i915_min_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else *val = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);
@@ -3779,7 +3779,7 @@ i915_min_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go below the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -2749,8 +2749,8 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,u32 vlv_flisdsi_read (struct drm_i915_private *dev_priv,u32 reg);void vlv_flisdsi_write (struct drm_i915_private *dev_priv,u32 reg,u32 val); -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val); -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val); +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val); +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);#define FORCEWAKE_RENDER (1 << 0)#define FORCEWAKE_MEDIA (1 << 1)
drivers/gpu/drm/i915/i915_sysfs.c +9 -9
@@ -269,7 +269,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,if (IS_VALLEYVIEW (dev_priv->dev)) {u32 freq; freq =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); - ret =vlv_gpu_freq (dev_priv, (freq >>8 ) &0xff ); + ret =intel_gpu_freq (dev_priv, (freq >>8 ) &0xff ); }else { ret = dev_priv->rps.cur_freq *GT_FREQUENCY_MULTIPLIER ; }
@@ -288,7 +288,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,struct drm_i915_private *dev_priv = dev->dev_private;return snprintf (buf,PAGE_SIZE ,"%d\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); }static ssize_t gt_max_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf)
@@ -302,7 +302,7 @@ static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else ret = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);
@@ -329,7 +329,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;
@@ -374,7 +374,7 @@ static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else ret = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);
@@ -401,7 +401,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;
@@ -462,17 +462,17 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrif (attr == &dev_attr_gt_RP0_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp0_freq);else val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq);else val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq);else val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {
drivers/gpu/drm/i915/intel_pm.c +38 -14
121 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 4/7 drm/i915: populate mem_freq/cz_clock for chv
In reply to [email protected]From: Deepak S <[email protected]>
We need mem_freq or cz clock for freq/opcode conversion
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ drivers/gpu/drm/i915/intel_pm.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -932,6 +932,7 @@ struct intel_gen6_power_mgmt {u8 efficient_freq;/* AKA RPe. Pre-determined balanced frequency */ u8 rp1_freq;/* "less than" RP0 power/freqency */ u8 rp0_freq;/* Non-overclocked max frequency. */ +u32 cz_freq;u32 ei_interrupt_count;
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -5541,6 +5541,12 @@ enum punit_power_well { GEN6_PM_RP_DOWN_THRESHOLD | \ GEN6_PM_RP_DOWN_TIMEOUT) +#define CHV_CZ_CLOCK_FREQ_MODE_200 200 +#define CHV_CZ_CLOCK_FREQ_MODE_267 267 +#define CHV_CZ_CLOCK_FREQ_MODE_320 320 +#define CHV_CZ_CLOCK_FREQ_MODE_333 333 +#define CHV_CZ_CLOCK_FREQ_MODE_400 400 +#define GEN7_GT_SCRATCH_BASE 0x4F100#define GEN7_GT_SCRATCH_REG_NUM 8
drivers/gpu/drm/i915/intel_pm.c +29 -0
@@ -5706,6 +5706,35 @@ static void valleyview_init_clock_gating(struct drm_device *dev)static void cherryview_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +u32 val; + +mutex_lock (&dev_priv->rps.hw_lock); + val =vlv_punit_read (dev_priv,CCK_FUSE_REG ); +mutex_unlock (&dev_priv->rps.hw_lock); +switch ((val >>2 ) &0x7 ) { +case 0 : +case 1 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_200 ; + dev_priv->mem_freq =1600 ; +break ; +case 2 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_267 ; + dev_priv->mem_freq =1600 ; +break ; +case 3 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_333 ; + dev_priv->mem_freq =2000 ; +break ; +case 4 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_320 ; + dev_priv->mem_freq =1600 ; +break ; +case 5 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_400 ; + dev_priv->mem_freq =1600 ; +break ; + } +DRM_DEBUG_DRIVER ("DDR speed: %d MHz" , dev_priv->mem_freq);I915_WRITE (DSPCLK_GATE_D ,VRHUNIT_CLOCK_GATE_DISABLE );
Signature · 1 line
1.9.1
PATCH 5/7 drm/i915: CHV GPU frequency to opcode functions
In reply to [email protected]From: Deepak S <[email protected]>
Adding chv specific fre/encode conversion.
--- drivers/gpu/drm/i915/intel_pm.c | 68 +++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +59 -9
@@ -6975,26 +6975,76 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } -int intel_gpu_freq (struct drm_i915_private *dev_priv,int val) +int chv_gpu_freq (struct drm_i915_private *dev_priv,int val) { -int ret; +int div, freq; -if (!IS_VALLEYVIEW (dev_priv->dev)) +switch (dev_priv->rps.cz_freq) { +case 200 : + div =5 ; +break ; +case 267 : + div =6 ; +break ; +case 320 : +case 333 : +case 400 : + div =8 ; +break ; +default :return -1 ; + } - ret =vlv_gpu_freq (dev_priv, val); + freq = (DIV_ROUND_CLOSEST ((dev_priv->rps.cz_freq * val),2 * div) /2 ); -return ret; +return freq; } -int intel_freq_opcode (struct drm_i915_private *dev_priv,int val) +int chv_freq_opcode (struct drm_i915_private *dev_priv,int val) { -int ret; +int mul, opcode; -if (!IS_VALLEYVIEW (dev_priv->dev)) +switch (dev_priv->rps.cz_freq) { +case 200 : + mul =5 ; +break ; +case 267 : + mul =6 ; +break ; +case 320 : +case 333 : +case 400 : + mul =8 ; +break ; +default :return -1 ; + } + + opcode = (DIV_ROUND_CLOSEST ((val *2 * mul), dev_priv->rps.cz_freq) *2 ); + +return opcode; +} + +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_gpu_freq (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =vlv_gpu_freq (dev_priv, val); + +return ret; +} + +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; - ret =vlv_freq_opcode (dev_priv, val); +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_freq_opcode (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =vlv_freq_opcode (dev_priv, val);return ret; }
Signature · 1 line
1.9.1
PATCH 6/7 drm/i915/chv: Add basic PM interrupt support for CHV
In reply to [email protected]From: Deepak S <[email protected]>
Enabled PM interrupt programming for CHV. Re-using gen8 code and extending same for CHV.
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -1403,7 +1403,7 @@ static void gen6_pm_rps_work(struct work_struct *work)spin_lock_irq (&dev_priv->irq_lock); pm_iir = dev_priv->rps.pm_iir; dev_priv->rps.pm_iir =0 ; -if (IS_BROADWELL (dev_priv->dev)) +if (IS_BROADWELL (dev_priv->dev) ||IS_CHERRYVIEW (dev_priv->dev))bdw_enable_pm_irq (dev_priv, dev_priv->pm_rps_events);else {/* Make sure not to corrupt PMIMR state used by ringbuffer */
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -3398,6 +3398,8 @@ static void cherryview_disable_rps(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;I915_WRITE (GEN6_RC_CONTROL ,0 ); + +gen8_disable_rps_interrupts (dev); }static void valleyview_disable_rps (struct drm_device *dev)
@@ -4115,6 +4117,8 @@ static void cherryview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); +gen8_enable_rps_interrupts (dev); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }
Signature · 1 line
1.9.1
PATCH 7/7 drm/i915: Add RP1 render P state thresholds in CHV
In reply to [email protected]From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
--- drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +15 -0
@@ -3809,6 +3809,16 @@ static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv)return rpe; } +int cherryview_rps_guar_freq (struct drm_i915_private *dev_priv) +{ +u32 val, rp1; + + val =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); + rp1 = (val >>PUNIT_GPU_STATUS_MAX_FREQ_SHIFT ) &PUNIT_GPU_STATUS_MAX_FREQ_MASK ; + +return rp1; +} +int cherryview_rps_min_freq (struct drm_i915_private *dev_priv) {u32 val, rpn;
@@ -4010,6 +4020,11 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =cherryview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar) GPU freq: %d MHz (%u)\n" , +intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),
Signature · 1 line
1.9.1
Re: [PATCH 3/7] drm/i915: keep freq/opcode conversion function more generic
In reply to [email protected]Quoted 19 lines · On Thu, Jul 10, 2014 at 01:16:23PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Since freq/encode conversion formula changes from platform to platform, create a generic wrapper function and having platform check inside this help to simpilfy adding newer platform freq/opcode conversion.
Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++----- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0
drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1143
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1140,14 +1140,14 @@ static int i915_frequency_info(struct seq_file *m, void *unused) val =valleyview_rps_max_freq (dev_priv);seq_printf (m,"max GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));
intel_ is a bit too generic a prefix for a function which seems to be only used on byt+chv. I'd just add a if (IS_CHERRYVIEW) ... else /* vlv code */ to both functions and not extract further.
Aside: Since marketing stopped using vlv and switched to byt we're using vlv for code shared by byt and chv and byt_ for byt-only code. Helps a bit to keep things appart.
-Daniel
Quoted 281 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-6val =valleyview_rps_min_freq (dev_priv);seq_printf (m,"min GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));seq_printf (m,"current GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff )); +intel_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff ));mutex_unlock (&dev_priv->rps.hw_lock); }else {seq_puts (m,"no P-state info available\n" );@@ -3667,7 +3667,7 @@ i915_max_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else *val = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -3698,7 +3698,7 @@ i915_max_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go above the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);@@ -3748,7 +3748,7 @@ i915_min_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else *val = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -3779,7 +3779,7 @@ i915_min_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go below the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -2749,8 +2749,8 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,u32 vlv_flisdsi_read (struct drm_i915_private *dev_priv,u32 reg);void vlv_flisdsi_write (struct drm_i915_private *dev_priv,u32 reg,u32 val); -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val); -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val); +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val); +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);#define FORCEWAKE_RENDER (1 << 0)#define FORCEWAKE_MEDIA (1 << 1)drivers/gpu/drm/i915/i915_sysfs.c +9
-9@@ -269,7 +269,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,if (IS_VALLEYVIEW (dev_priv->dev)) {u32 freq; freq =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); - ret =vlv_gpu_freq (dev_priv, (freq >>8 ) &0xff ); + ret =intel_gpu_freq (dev_priv, (freq >>8 ) &0xff ); }else { ret = dev_priv->rps.cur_freq *GT_FREQUENCY_MULTIPLIER ; }@@ -288,7 +288,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,struct drm_i915_private *dev_priv = dev->dev_private;return snprintf (buf,PAGE_SIZE ,"%d\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); }static ssize_t gt_max_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf)@@ -302,7 +302,7 @@ static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else ret = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -329,7 +329,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;@@ -374,7 +374,7 @@ static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else ret = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -401,7 +401,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;@@ -462,17 +462,17 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrif (attr == &dev_attr_gt_RP0_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp0_freq);else val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq);else val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq);else val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {drivers/gpu/drm/i915/intel_pm.c +38
-14@@ -3328,9 +3328,9 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)WARN_ON (val < dev_priv->rps.min_freq_softlimit);DRM_DEBUG_DRIVER ("GPU freq request from %d MHz (%u) to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq, -vlv_gpu_freq (dev_priv, val), val); +intel_gpu_freq (dev_priv, val), val);if (val != dev_priv->rps.cur_freq)vlv_punit_write (dev_priv,PUNIT_REG_GPU_FREQ_REQ , val);@@ -3338,7 +3338,7 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)I915_WRITE (GEN6_PMINTRMSK ,gen6_rps_pm_mask (dev_priv, val)); dev_priv->rps.cur_freq = val; -trace_intel_gpu_freq_change (vlv_gpu_freq (dev_priv, val)); +trace_intel_gpu_freq_change (intel_gpu_freq (dev_priv, val)); }static void gen8_disable_rps_interrupts (struct drm_device *dev)@@ -3961,22 +3961,22 @@ static void valleyview_init_gt_powersave(struct drm_device *dev) dev_priv->rps.max_freq =valleyview_rps_max_freq (dev_priv); dev_priv->rps.rp0_freq = dev_priv->rps.max_freq;DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.max_freq), dev_priv->rps.max_freq); dev_priv->rps.efficient_freq =valleyview_rps_rpe_freq (dev_priv);DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); dev_priv->rps.rp1_freq =valleyview_rps_guar_freq (dev_priv);DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), dev_priv->rps.rp1_freq); dev_priv->rps.min_freq =valleyview_rps_min_freq (dev_priv);DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), dev_priv->rps.min_freq);/* Preserve min/max settings in case of re-init */ @@ -4000,17 +4000,17 @@ static void cherryview_init_gt_powersave(struct drm_device *dev) dev_priv->rps.max_freq =cherryview_rps_max_freq (dev_priv); dev_priv->rps.rp0_freq = dev_priv->rps.max_freq;DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.max_freq), dev_priv->rps.max_freq); dev_priv->rps.efficient_freq =cherryview_rps_rpe_freq (dev_priv);DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv);DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), dev_priv->rps.min_freq);/* Preserve min/max settings in case of re-init */ @@ -4106,11 +4106,11 @@ static void cherryview_enable_rps(struct drm_device *dev) dev_priv->rps.cur_freq = (val >>8 ) &0xff ;DRM_DEBUG_DRIVER ("current GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq);DRM_DEBUG_DRIVER ("setting GPU freq to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq);valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq);@@ -4184,11 +4184,11 @@ static void valleyview_enable_rps(struct drm_device *dev) dev_priv->rps.cur_freq = (val >>8 ) &0xff ;DRM_DEBUG_DRIVER ("current GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq);DRM_DEBUG_DRIVER ("setting GPU freq to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq);valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq);@@ -6946,6 +6946,30 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret; + +if (!IS_VALLEYVIEW (dev_priv->dev)) +return -1 ; + + ret =vlv_gpu_freq (dev_priv, val); + +return ret; +} + +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret; + +if (!IS_VALLEYVIEW (dev_priv->dev)) +return -1 ; + + ret =vlv_freq_opcode (dev_priv, val); + +return ret; +} +void intel_pm_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 3/7] drm/i915: keep freq/opcode conversion function more generic
Quoted 29 lines · Daniel Vetter
Quoted 19 lines · On Thu, Jul 10, 2014 at 01:16:23PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Since freq/encode conversion formula changes from platform to platform, create a generic wrapper function and having platform check inside this help to simpilfy adding newer platform freq/opcode conversion.
Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++----- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1143
Quoted 5 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1140,14 +1140,14 @@ static int i915_frequency_info(struct seq_file *m, void *unused) val =valleyview_rps_max_freq (dev_priv);seq_printf (m,"max GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));
intel_is a bit too generic a prefix for a function which seems to be only used on byt+chv. I'd just add a if (IS_CHERRYVIEW) ... else /* vlv code */ to both functions and not extract further.
Quoted 4 lines
Aside: Since marketing stopped using vlv and switched to byt we're using vlv for code shared by byt and chv and
byt_for byt-only code. Helps a bit to keep things appart.
-Daniel
Ok. Will it be Ok to use "vlv_gpu_freq" and have BYT and CHV check under this function?
The reason why i made more generic is it will help us to add conversion logic for future platforms
Thanks
Deepak
Quoted 281 lines
Quoted 281 lines
drivers/gpu/drm/i915/i915_debugfs.c +6
-6val =valleyview_rps_min_freq (dev_priv);seq_printf (m,"min GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));seq_printf (m,"current GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff )); +intel_gpu_freq (dev_priv, (freq_sts >>8 ) &0xff ));mutex_unlock (&dev_priv->rps.hw_lock); }else {seq_puts (m,"no P-state info available\n" );@@ -3667,7 +3667,7 @@ i915_max_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else *val = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -3698,7 +3698,7 @@ i915_max_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go above the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);@@ -3748,7 +3748,7 @@ i915_min_freq_get(void *data, u64 *val)return ret;if (IS_VALLEYVIEW (dev)) - *val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else *val = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -3779,7 +3779,7 @@ i915_min_freq_set(void *data, u64 val)* Turbo will still be enabled, but won't go below the set value. */ if (IS_VALLEYVIEW (dev)) { - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val); hw_max =valleyview_rps_max_freq (dev_priv); hw_min =valleyview_rps_min_freq (dev_priv);drivers/gpu/drm/i915/i915_drv.h +2
-2@@ -2749,8 +2749,8 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value,u32 vlv_flisdsi_read (struct drm_i915_private *dev_priv,u32 reg);void vlv_flisdsi_write (struct drm_i915_private *dev_priv,u32 reg,u32 val); -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val); -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val); +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val); +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);#define FORCEWAKE_RENDER (1 << 0)#define FORCEWAKE_MEDIA (1 << 1)drivers/gpu/drm/i915/i915_sysfs.c +9
-9@@ -269,7 +269,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,if (IS_VALLEYVIEW (dev_priv->dev)) {u32 freq; freq =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); - ret =vlv_gpu_freq (dev_priv, (freq >>8 ) &0xff ); + ret =intel_gpu_freq (dev_priv, (freq >>8 ) &0xff ); }else { ret = dev_priv->rps.cur_freq *GT_FREQUENCY_MULTIPLIER ; }@@ -288,7 +288,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,struct drm_i915_private *dev_priv = dev->dev_private;return snprintf (buf,PAGE_SIZE ,"%d\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); }static ssize_t gt_max_freq_mhz_show (struct device *kdev,struct device_attribute *attr,char *buf)@@ -302,7 +302,7 @@ static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit);else ret = dev_priv->rps.max_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -329,7 +329,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;@@ -374,7 +374,7 @@ static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attributemutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev_priv->dev)) - ret =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + ret =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit);else ret = dev_priv->rps.min_freq_softlimit *GT_FREQUENCY_MULTIPLIER ;mutex_unlock (&dev_priv->rps.hw_lock);@@ -401,7 +401,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,mutex_lock (&dev_priv->rps.hw_lock);if (IS_VALLEYVIEW (dev)) - val =vlv_freq_opcode (dev_priv, val); + val =intel_freq_opcode (dev_priv, val);else val /=GT_FREQUENCY_MULTIPLIER ;@@ -462,17 +462,17 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrif (attr == &dev_attr_gt_RP0_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp0_freq);else val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq);else val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) {if (IS_VALLEYVIEW (dev)) - val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); + val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq);else val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {drivers/gpu/drm/i915/intel_pm.c +38
-14@@ -3328,9 +3328,9 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)WARN_ON (val < dev_priv->rps.min_freq_softlimit);DRM_DEBUG_DRIVER ("GPU freq request from %d MHz (%u) to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq, -vlv_gpu_freq (dev_priv, val), val); +intel_gpu_freq (dev_priv, val), val);if (val != dev_priv->rps.cur_freq)vlv_punit_write (dev_priv,PUNIT_REG_GPU_FREQ_REQ , val);@@ -3338,7 +3338,7 @@ void valleyview_set_rps(struct drm_device *dev, u8 val)I915_WRITE (GEN6_PMINTRMSK ,gen6_rps_pm_mask (dev_priv, val)); dev_priv->rps.cur_freq = val; -trace_intel_gpu_freq_change (vlv_gpu_freq (dev_priv, val)); +trace_intel_gpu_freq_change (intel_gpu_freq (dev_priv, val)); }static void gen8_disable_rps_interrupts (struct drm_device *dev)@@ -3961,22 +3961,22 @@ static void valleyview_init_gt_powersave(struct drm_device *dev) dev_priv->rps.max_freq =valleyview_rps_max_freq (dev_priv); dev_priv->rps.rp0_freq = dev_priv->rps.max_freq;DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.max_freq), dev_priv->rps.max_freq); dev_priv->rps.efficient_freq =valleyview_rps_rpe_freq (dev_priv);DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); dev_priv->rps.rp1_freq =valleyview_rps_guar_freq (dev_priv);DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), dev_priv->rps.rp1_freq); dev_priv->rps.min_freq =valleyview_rps_min_freq (dev_priv);DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), dev_priv->rps.min_freq);/* Preserve min/max settings in case of re-init */ @@ -4000,17 +4000,17 @@ static void cherryview_init_gt_powersave(struct drm_device *dev) dev_priv->rps.max_freq =cherryview_rps_max_freq (dev_priv); dev_priv->rps.rp0_freq = dev_priv->rps.max_freq;DRM_DEBUG_DRIVER ("max GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.max_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.max_freq), dev_priv->rps.max_freq); dev_priv->rps.efficient_freq =cherryview_rps_rpe_freq (dev_priv);DRM_DEBUG_DRIVER ("RPe GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv);DRM_DEBUG_DRIVER ("min GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), dev_priv->rps.min_freq);/* Preserve min/max settings in case of re-init */ @@ -4106,11 +4106,11 @@ static void cherryview_enable_rps(struct drm_device *dev) dev_priv->rps.cur_freq = (val >>8 ) &0xff ;DRM_DEBUG_DRIVER ("current GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq);DRM_DEBUG_DRIVER ("setting GPU freq to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq);valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq);@@ -4184,11 +4184,11 @@ static void valleyview_enable_rps(struct drm_device *dev) dev_priv->rps.cur_freq = (val >>8 ) &0xff ;DRM_DEBUG_DRIVER ("current GPU freq: %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.cur_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq), dev_priv->rps.cur_freq);DRM_DEBUG_DRIVER ("setting GPU freq to %d MHz (%u)\n" , -vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), +intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq);valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq);@@ -6946,6 +6946,30 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } +int intel_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret; + +if (!IS_VALLEYVIEW (dev_priv->dev)) +return -1 ; + + ret =vlv_gpu_freq (dev_priv, val); + +return ret; +} + +int intel_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret; + +if (!IS_VALLEYVIEW (dev_priv->dev)) +return -1 ; + + ret =vlv_freq_opcode (dev_priv, val); + +return ret; +} +void intel_pm_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/7] drm/i915: keep freq/opcode conversion function more generic
Quoted 30 lines · Deepak S
Quoted 28 lines · Daniel Vetter
Quoted 19 lines · On Thu, Jul 10, 2014 at 01:16:23PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Since freq/encode conversion formula changes from platform to platform, create a generic wrapper function and having platform check inside this help to simpilfy adding newer platform freq/opcode conversion.
Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++----- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1142
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1140,14 +1140,14 @@ static int i915_frequency_info(struct seq_file *m, void *unused) val =valleyview_rps_max_freq (dev_priv);seq_printf (m,"max GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));
intel_is a bit too generic a prefix for a function which seems to be only used on byt+chv. I'd just add a if (IS_CHERRYVIEW) ... else /* vlv code */ to both functions and not extract further.
Quoted 7 lines
Quoted 4 lines
Aside: Since marketing stopped using vlv and switched to byt we're using vlv for code shared by byt and chv and
byt_for byt-only code. Helps a bit to keep things appart.
-DanielOk. Will it be Ok to use "
vlv_gpu_freq" and have BYT and CHV check under this function?
Yeah, that's my idea.
Quoted 2 lines
The reason why i made more generic is it will help us to add conversion logic for future platforms
We can look at this again when it happpens. With the current code this doesn't include desktop rps so the intel_ prefix was a bit confusing. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 3/7] drm/i915: keep freq/opcode conversion function more generic
Quoted 36 lines · Daniel Vetter
Quoted 29 lines · Deepak S
Quoted 28 lines · Daniel Vetter
Quoted 19 lines · On Thu, Jul 10, 2014 at 01:16:23PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Since freq/encode conversion formula changes from platform to platform, create a generic wrapper function and having platform check inside this help to simpilfy adding newer platform freq/opcode conversion.
Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 14 +++++----- drivers/gpu/drm/i915/i915_drv.h | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 18 ++++++------- drivers/gpu/drm/i915/intel_pm.c | 52 +++++++++++++++++++++++++++---------- 4 files changed, 56 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0drivers/gpu/drm/i915/i915_debugfs.c static int i915_frequency_info(struct seq_file *m, void *unused) · line 1142
Quoted 4 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -1140,14 +1140,14 @@ static int i915_frequency_info(struct seq_file *m, void *unused) val =valleyview_rps_max_freq (dev_priv);seq_printf (m,"max GPU freq: %d MHz\n" , -vlv_gpu_freq (dev_priv, val)); +intel_gpu_freq (dev_priv, val));
intel_is a bit too generic a prefix for a function which seems to be only used on byt+chv. I'd just add a if (IS_CHERRYVIEW) ... else /* vlv code */ to both functions and not extract further.Quoted 6 lines
Quoted 4 lines
Aside: Since marketing stopped using vlv and switched to byt we're using vlv for code shared by byt and chv and
byt_for byt-only code. Helps a bit to keep things appart.
-DanielOk. Will it be Ok to use "
vlv_gpu_freq" and have BYT and CHV check under this function?
Quoted 7 lines
Yeah, that's my idea.
Quoted 2 lines
The reason why i made more generic is it will help us to add conversion logic for future platforms
We can look at this again when it happpens. With the current code this doesn't include desktop rps so the
intel_prefix was a bit confusing. -Daniel
Ok. Thanks for the feedback. I will update and send new patch set
PATCH v2 1/3 drm/i915: CHV GPU frequency to opcode functions
In reply to [email protected]From: Deepak S <[email protected]>
Adding chv specific fre/encode conversion.
v2: Remove generic function and platform check (Daniel)
--- drivers/gpu/drm/i915/intel_pm.c | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +76 -2
@@ -6931,7 +6931,7 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u8 mbox, u32 val)return 0 ; } -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +int byt_gpu_freq (struct drm_i915_private *dev_priv,int val) {int div;
@@ -6953,7 +6953,7 @@ int vlv_gpu_freq(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (dev_priv->mem_freq * (val +6 -0xbd ),4 * div); } -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +int byt_freq_opcode (struct drm_i915_private *dev_priv,int val) {int mul;
@@ -6975,6 +6975,80 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } +int chv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int div, freq; + +switch (dev_priv->rps.cz_freq) { +case 200 : + div =5 ; +break ; +case 267 : + div =6 ; +break ; +case 320 : +case 333 : +case 400 : + div =8 ; +break ; +default : +return -1 ; + } + + freq = (DIV_ROUND_CLOSEST ((dev_priv->rps.cz_freq * val),2 * div) /2 ); + +return freq; +} + +int chv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int mul, opcode; + +switch (dev_priv->rps.cz_freq) { +case 200 : + mul =5 ; +break ; +case 267 : + mul =6 ; +break ; +case 320 : +case 333 : +case 400 : + mul =8 ; +break ; +default : +return -1 ; + } + + opcode = (DIV_ROUND_CLOSEST ((val *2 * mul), dev_priv->rps.cz_freq) *2 ); + +return opcode; +} + +int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_gpu_freq (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_gpu_freq (dev_priv, val); + +return ret; +} + +int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_freq_opcode (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_freq_opcode (dev_priv, val); + +return ret; +} +void intel_pm_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
Signature · 1 line
1.9.1
PATCH v2 1/1 drm/i915: Add RP1 render P state thresholds in CHV
In reply to [email protected]From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
v2: Use vlv_gpu_freq to get freq (Deepak)
--- drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/gpu/drm/i915/intel_pm.c +15 -0
@@ -3809,6 +3809,16 @@ static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv)return rpe; } +int cherryview_rps_guar_freq (struct drm_i915_private *dev_priv) +{ +u32 val, rp1; + + val =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); + rp1 = (val >>PUNIT_GPU_STATUS_MAX_FREQ_SHIFT ) &PUNIT_GPU_STATUS_MAX_FREQ_MASK ; + +return rp1; +} +int cherryview_rps_min_freq (struct drm_i915_private *dev_priv) {u32 val, rpn;
@@ -4010,6 +4020,11 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =cherryview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),
Signature · 1 line
1.9.1
Re: [PATCH 1/7] drm/i915: Read guaranteed freq for valleyview
In reply to [email protected]Quoted 6 lines · [email protected] writes:
From: Deepak S <[email protected]>
Reading RP1 for valleyview to help us enable "
pm_rps" i-g-t testcase execution.Signed-off-by Deepak S <[email protected]>
Quoted 45 lines
--- drivers/gpu/drm/i915/intel_pm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/i915/intel_pm.c +16
-0@@ -3816,6 +3816,17 @@ int cherryview_rps_min_freq(struct drm_i915_private *dev_priv)return rpn; } +int valleyview_rps_guar_freq (struct drm_i915_private *dev_priv) +{ +u32 val, rp1; + + val =vlv_nc_read (dev_priv,IOSF_NC_FB_GFX_FREQ_FUSE ); + + rp1 = (val &FB_GFX_FGUARANTEED_FREQ_FUSE_MASK ) >>FB_GFX_FGUARANTEED_FREQ_FUSE_SHIFT ; + +return rp1; +} +int valleyview_rps_max_freq (struct drm_i915_private *dev_priv) {u32 val, rp0;@@ -3958,6 +3969,11 @@ static void valleyview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =valleyview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =valleyview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/7] drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs
In reply to [email protected]Quoted 6 lines · [email protected] writes:
From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
Signed-off-by Deepak S <[email protected]>
Quoted 49 lines
--- drivers/gpu/drm/i915/i915_sysfs.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_sysfs.c +15
-3@@ -461,11 +461,20 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrmutex_unlock (&dev->struct_mutex);if (attr == &dev_attr_gt_RP0_freq_mhz) { - val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); +else + val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) { - val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); +else + val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) { - val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); +else + val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {BUG (); }@@ -486,6 +495,9 @@ static const struct attribute *vlv_attrs[] = { &dev_attr_gt_cur_freq_mhz.attr, &dev_attr_gt_max_freq_mhz.attr, &dev_attr_gt_min_freq_mhz.attr, + &dev_attr_gt_RP0_freq_mhz.attr, + &dev_attr_gt_RP1_freq_mhz.attr, + &dev_attr_gt_RPn_freq_mhz.attr, &dev_attr_vlv_rpe_freq_mhz.attr, NULL, };Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/7] drm/i915: populate mem_freq/cz_clock for chv
In reply to [email protected]Quoted 28 lines · [email protected] writes:
From: Deepak S <[email protected]>
We need
mem_freqor cz clock for freq/opcode conversionSigned-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ drivers/gpu/drm/i915/intel_pm.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -932,6 +932,7 @@ struct intel_gen6_power_mgmt {u8 efficient_freq;/* AKA RPe. Pre-determined balanced frequency */ u8 rp1_freq;/* "less than" RP0 power/freqency */ u8 rp0_freq;/* Non-overclocked max frequency. */ +u32 cz_freq;u32 ei_interrupt_count;drivers/gpu/drm/i915/i915_reg.h +0
-0
drivers/gpu/drm/i915/i915_reg.h enum punit_power_well { · line 5549
Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -5541,6 +5541,12 @@ enum punit_power_well { GEN6_PM_RP_DOWN_THRESHOLD | \ GEN6_PM_RP_DOWN_TIMEOUT) +#define CHV_CZ_CLOCK_FREQ_MODE_200 200 +#define CHV_CZ_CLOCK_FREQ_MODE_267 267 +#define CHV_CZ_CLOCK_FREQ_MODE_320 320 +#define CHV_CZ_CLOCK_FREQ_MODE_333 333 +#define CHV_CZ_CLOCK_FREQ_MODE_400 400 +
No need to define these in my opinion as it is 1:1. Just use the numbers straight.
Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +0
-0#define GEN7_GT_SCRATCH_BASE 0x4F100#define GEN7_GT_SCRATCH_REG_NUM 8drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void valleyview_init_clock_gating(struct drm_device *dev) · line 5712
Quoted 7 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0@@ -5706,6 +5706,35 @@ static void valleyview_init_clock_gating(struct drm_device *dev)static void cherryview_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +u32 val; + +mutex_lock (&dev_priv->rps.hw_lock); + val =vlv_punit_read (dev_priv,CCK_FUSE_REG );
s/punit/cck (?)
With the changes mentioned above:
Quoted 35 lines
drivers/gpu/drm/i915/intel_pm.c +25
-0+mutex_unlock (&dev_priv->rps.hw_lock); +switch ((val >>2 ) &0x7 ) { +case 0 : +case 1 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_200 ; + dev_priv->mem_freq =1600 ; +break ; +case 2 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_267 ; + dev_priv->mem_freq =1600 ; +break ; +case 3 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_333 ; + dev_priv->mem_freq =2000 ; +break ; +case 4 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_320 ; + dev_priv->mem_freq =1600 ; +break ; +case 5 : + dev_priv->rps.cz_freq =CHV_CZ_CLOCK_FREQ_MODE_400 ; + dev_priv->mem_freq =1600 ; +break ; + } +DRM_DEBUG_DRIVER ("DDR speed: %d MHz" , dev_priv->mem_freq);I915_WRITE (DSPCLK_GATE_D ,VRHUNIT_CLOCK_GATE_DISABLE );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/7] drm/i915/chv: Add basic PM interrupt support for CHV
In reply to [email protected]Quoted 5 lines · [email protected] writes:
From: Deepak S <[email protected]>
Enabled PM interrupt programming for CHV. Re-using gen8 code and extending same for CHV.
Signed-off-by Deepak S <[email protected]>
Quoted 47 lines
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -1403,7 +1403,7 @@ static void gen6_pm_rps_work(struct work_struct *work)spin_lock_irq (&dev_priv->irq_lock); pm_iir = dev_priv->rps.pm_iir; dev_priv->rps.pm_iir =0 ; -if (IS_BROADWELL (dev_priv->dev)) +if (IS_BROADWELL (dev_priv->dev) ||IS_CHERRYVIEW (dev_priv->dev))bdw_enable_pm_irq (dev_priv, dev_priv->pm_rps_events);else {/* Make sure not to corrupt PMIMR state used by ringbuffer */ drivers/gpu/drm/i915/intel_pm.c +4
-0@@ -3398,6 +3398,8 @@ static void cherryview_disable_rps(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;I915_WRITE (GEN6_RC_CONTROL ,0 ); + +gen8_disable_rps_interrupts (dev); }static void valleyview_disable_rps (struct drm_device *dev)@@ -4115,6 +4117,8 @@ static void cherryview_enable_rps(struct drm_device *dev)valleyview_set_rps (dev_priv->dev, dev_priv->rps.efficient_freq); +gen8_enable_rps_interrupts (dev); +gen6_gt_force_wake_put (dev_priv,FORCEWAKE_ALL ); }Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/3] drm/i915: CHV GPU frequency to opcode functions
In reply to [email protected]Quoted 7 lines · [email protected] writes:
From: Deepak S <[email protected]>
Adding chv specific fre/encode conversion.
v2: Remove generic function and platform check (Daniel)
Signed-off-by Deepak S <[email protected]>
Quoted 114 lines
--- drivers/gpu/drm/i915/intel_pm.c | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +76
-2@@ -6931,7 +6931,7 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u8 mbox, u32 val)return 0 ; } -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +int byt_gpu_freq (struct drm_i915_private *dev_priv,int val) {int div;@@ -6953,7 +6953,7 @@ int vlv_gpu_freq(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (dev_priv->mem_freq * (val +6 -0xbd ),4 * div); } -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +int byt_freq_opcode (struct drm_i915_private *dev_priv,int val) {int mul;@@ -6975,6 +6975,80 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } +int chv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int div, freq; + +switch (dev_priv->rps.cz_freq) { +case 200 : + div =5 ; +break ; +case 267 : + div =6 ; +break ; +case 320 : +case 333 : +case 400 : + div =8 ; +break ; +default : +return -1 ; + } + + freq = (DIV_ROUND_CLOSEST ((dev_priv->rps.cz_freq * val),2 * div) /2 ); + +return freq; +} + +int chv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int mul, opcode; + +switch (dev_priv->rps.cz_freq) { +case 200 : + mul =5 ; +break ; +case 267 : + mul =6 ; +break ; +case 320 : +case 333 : +case 400 : + mul =8 ; +break ; +default : +return -1 ; + } + + opcode = (DIV_ROUND_CLOSEST ((val *2 * mul), dev_priv->rps.cz_freq) *2 ); + +return opcode; +} + +int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_gpu_freq (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_gpu_freq (dev_priv, val); + +return ret; +} + +int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_freq_opcode (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_freq_opcode (dev_priv, val); + +return ret; +} +void intel_pm_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/7] drm/i915: Read guaranteed freq for valleyview
In reply to Mika KuoppalaQuoted 23 lines · Mika Kuoppala
Quoted 6 lines · [email protected] writes:
From: Deepak S <[email protected]>
Reading RP1 for valleyview to help us enable "
pm_rps" i-g-t testcase execution.Signed-off-by Deepak S <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>Quoted 12 lines
--- drivers/gpu/drm/i915/intel_pm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3816,6 +3816,17 @@ int cherryview_rps_min_freq(struct drm_i915_private *dev_priv)return rpn; }
Quoted 1 line
drivers/gpu/drm/i915/intel_pm.c int cherryview_rps_min_freq(struct drm_i915_private *dev_priv) · line 3819
Quoted 1 line
drivers/gpu/drm/i915/intel_pm.c +1
-0+int valleyview_rps_guar_freq (struct drm_i915_private *dev_priv)
Missing static here. Fixed and queued for -next, thanks for the patch. -Daniel
Quoted 36 lines
Quoted 32 lines
drivers/gpu/drm/i915/intel_pm.c +15
-0+{ +u32 val, rp1; + + val =vlv_nc_read (dev_priv,IOSF_NC_FB_GFX_FREQ_FUSE ); + + rp1 = (val &FB_GFX_FGUARANTEED_FREQ_FUSE_MASK ) >>FB_GFX_FGUARANTEED_FREQ_FUSE_SHIFT ; + +return rp1; +} +int valleyview_rps_max_freq (struct drm_i915_private *dev_priv) {u32 val, rp0;@@ -3958,6 +3969,11 @@ static void valleyview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =valleyview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar Freq) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =valleyview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),Signature · 6 lines
1.9.1 _______________________________________________ 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH v2 1/3] drm/i915: CHV GPU frequency to opcode functions
In reply to [email protected]Quoted 7 lines · On Sat, Jul 12, 2014 at 02:54:33PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Adding chv specific fre/encode conversion.
v2: Remove generic function and platform check (Daniel)
Signed-off-by Deepak S <[email protected]>
When resubmitting patches into an existing patchbomb thread please use --in-reply-to the old patch this new one here replaces. Otherwise I'll have a good chance to pick up patches out of order or the wrong ones.
Thanks, Daniel
Quoted 114 lines
--- drivers/gpu/drm/i915/intel_pm.c | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_pm.c +76
-2@@ -6931,7 +6931,7 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u8 mbox, u32 val)return 0 ; } -int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +int byt_gpu_freq (struct drm_i915_private *dev_priv,int val) {int div;@@ -6953,7 +6953,7 @@ int vlv_gpu_freq(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (dev_priv->mem_freq * (val +6 -0xbd ),4 * div); } -int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +int byt_freq_opcode (struct drm_i915_private *dev_priv,int val) {int mul;@@ -6975,6 +6975,80 @@ int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val)return DIV_ROUND_CLOSEST (4 * mul * val, dev_priv->mem_freq) +0xbd -6 ; } +int chv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int div, freq; + +switch (dev_priv->rps.cz_freq) { +case 200 : + div =5 ; +break ; +case 267 : + div =6 ; +break ; +case 320 : +case 333 : +case 400 : + div =8 ; +break ; +default : +return -1 ; + } + + freq = (DIV_ROUND_CLOSEST ((dev_priv->rps.cz_freq * val),2 * div) /2 ); + +return freq; +} + +int chv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int mul, opcode; + +switch (dev_priv->rps.cz_freq) { +case 200 : + mul =5 ; +break ; +case 267 : + mul =6 ; +break ; +case 320 : +case 333 : +case 400 : + mul =8 ; +break ; +default : +return -1 ; + } + + opcode = (DIV_ROUND_CLOSEST ((val *2 * mul), dev_priv->rps.cz_freq) *2 ); + +return opcode; +} + +int vlv_gpu_freq (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_gpu_freq (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_gpu_freq (dev_priv, val); + +return ret; +} + +int vlv_freq_opcode (struct drm_i915_private *dev_priv,int val) +{ +int ret =-1 ; + +if (IS_CHERRYVIEW (dev_priv->dev)) + ret =chv_freq_opcode (dev_priv, val); +else if (IS_VALLEYVIEW (dev_priv->dev)) + ret =byt_freq_opcode (dev_priv, val); + +return ret; +} +void intel_pm_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 2/7] drm/i915: Add RP0/RP1/RPn render P state thresholds in VLV sysfs
In reply to [email protected]Quoted 39 lines · On Thu, Jul 10, 2014 at 01:16:22PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/i915_sysfs.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_sysfs.c +12
-3@@ -461,11 +461,20 @@ static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attrmutex_unlock (&dev->struct_mutex);if (attr == &dev_attr_gt_RP0_freq_mhz) { - val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp0_freq); +else + val = ((rp_state_cap &0x0000ff ) >>0 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RP1_freq_mhz) { - val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq); +else + val = ((rp_state_cap &0x00ff00 ) >>8 ) *GT_FREQUENCY_MULTIPLIER ; }else if (attr == &dev_attr_gt_RPn_freq_mhz) { - val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; +if (IS_VALLEYVIEW (dev)) + val =vlv_gpu_freq (dev_priv, dev_priv->rps.min_freq); +else + val = ((rp_state_cap &0xff0000 ) >>16 ) *GT_FREQUENCY_MULTIPLIER ; }else {BUG (); }
drivers/gpu/drm/i915/i915_sysfs.c static const struct attribute *vlv_attrs[] = { · line 503
Quoted 9 lines
drivers/gpu/drm/i915/i915_sysfs.c +3
-0@@ -486,6 +495,9 @@ static const struct attribute *vlv_attrs[] = { &dev_attr_gt_cur_freq_mhz.attr, &dev_attr_gt_max_freq_mhz.attr, &dev_attr_gt_min_freq_mhz.attr, + &dev_attr_gt_RP0_freq_mhz.attr, + &dev_attr_gt_RP1_freq_mhz.attr, + &dev_attr_gt_RPn_freq_mhz.attr, &dev_attr_vlv_rpe_freq_mhz.attr, NULL, };
This now exactly matches gen6_attrs, so I've killed it while applying. -Daniel
Quoted 7 lines
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH v2] drm/i915: Add RP1 render P state thresholds in CHV
In reply to [email protected]Quoted 17 lines · [email protected] writes:
From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
v2: Use
vlv_gpu_freqto get freq (Deepak)Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv) · line 3812
Quoted 4 lines
drivers/gpu/drm/i915/intel_pm.c +1
-0@@ -3809,6 +3809,16 @@ static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv)return rpe; } +int cherryview_rps_guar_freq (struct drm_i915_private *dev_priv)
^^static
Daniel said he will add it, missing in other patches too.
Quoted 31 lines
drivers/gpu/drm/i915/intel_pm.c +14
-0+{ +u32 val, rp1; + + val =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); + rp1 = (val >>PUNIT_GPU_STATUS_MAX_FREQ_SHIFT ) &PUNIT_GPU_STATUS_MAX_FREQ_MASK ; + +return rp1; +} +int cherryview_rps_min_freq (struct drm_i915_private *dev_priv) {u32 val, rpn;@@ -4010,6 +4020,11 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =cherryview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2] drm/i915: Add RP1 render P state thresholds in CHV
Quoted 22 lines · Mika Kuoppala
Quoted 20 lines · [email protected] writes:
From: Deepak S <[email protected]>
This is useful for userspace utilities to verify and micromanaging the increase/decrease frequncy.
v2: Use
vlv_gpu_freqto get freq (Deepak)Signed-off-by Deepak S <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3809,6 +3809,16 @@ static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv)return rpe; }
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c static int cherryview_rps_rpe_freq(struct drm_i915_private *dev_priv) · line 3812
Quoted 1 line
drivers/gpu/drm/i915/intel_pm.c +1
-0+int cherryview_rps_guar_freq (struct drm_i915_private *dev_priv)^^static
Daniel said he will add it, missing in other patches too.Reviewed-by Mika Kuoppala <[email protected]>
Ok, I've stitched it together and merged to dinq, thanks. -Daniel
Quoted 36 lines
Quoted 32 lines
drivers/gpu/drm/i915/intel_pm.c +14
-0+{ +u32 val, rp1; + + val =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS ); + rp1 = (val >>PUNIT_GPU_STATUS_MAX_FREQ_SHIFT ) &PUNIT_GPU_STATUS_MAX_FREQ_MASK ; + +return rp1; +} +int cherryview_rps_min_freq (struct drm_i915_private *dev_priv) {u32 val, rpn;@@ -4010,6 +4020,11 @@ static void cherryview_init_gt_powersave(struct drm_device *dev)vlv_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), dev_priv->rps.efficient_freq); + dev_priv->rps.rp1_freq =cherryview_rps_guar_freq (dev_priv); +DRM_DEBUG_DRIVER ("RP1(Guar) GPU freq: %d MHz (%u)\n" , +vlv_gpu_freq (dev_priv, dev_priv->rps.rp1_freq), + dev_priv->rps.rp1_freq); + dev_priv->rps.min_freq =cherryview_rps_min_freq (dev_priv); DRM_DEBUG_DRIVER("min GPU freq: %d MHz (%u)\n", vlv_gpu_freq(dev_priv, dev_priv->rps.min_freq),Signature · 6 lines
1.9.1 _______________________________________________ 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch