drm/i915: Separate RC6, RPS, Ring Frequency management
Subsystems (2)
cover drm/i915: Separate RC6, RPS, Ring Frequency management
With GuC based SLPC, frequency control will be moved to GuC and Host will continue to control RC6 and Ring frequency setup. This needs separate handling of RPS, RC6 and ring frequencies in i915 flows. We still continue use the *gt_powersave routines with separate status variables for RPS, RC6, ring frequency as pm.rps.enabled, pm.rc6.enabled and pm.ring_pstate.configured respectively in dev_priv.
Post this, with SLPC changes integrated we can just skip the Host RPS path in i915 PM flows.
Sagar Arun Kamble (10):
drm/i915: Separate RPS and RC6 handling for gen6+ drm/i915: Separate RPS and RC6 handling for BDW drm/i915: Separate RPS and RC6 handling for VLV drm/i915: Separate RPS and RC6 handling for CHV drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm" drm/i915: Name structure in dev_priv that contains RPS/RC6 state as
"pm"
drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled drm/i915: Create generic function to setup ring frequency table drm/i915: Create generic functions to control RC6, RPS drm/i915: Introduce separate status variable for RC6 and Ring
frequency setup
drivers/gpu/drm/i915/i915_debugfs.c | 158 +++---- drivers/gpu/drm/i915/i915_drv.c | 10 +- drivers/gpu/drm/i915/i915_drv.h | 24 +- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +- drivers/gpu/drm/i915/i915_irq.c | 94 +++-- drivers/gpu/drm/i915/i915_sysfs.c | 72 ++-- drivers/gpu/drm/i915/intel_cdclk.c | 40 +- drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/i915/intel_drv.h | 14 +- drivers/gpu/drm/i915/intel_pm.c | 638 +++++++++++++++++------------ drivers/gpu/drm/i915/intel_runtime_pm.c | 26 +- drivers/gpu/drm/i915/intel_sideband.c | 6 +- drivers/gpu/drm/i915/intel_uc.c | 3 +- 15 files changed, 631 insertions(+), 480 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/10 drm/i915: Separate RPS and RC6 handling for gen6+
This patch separates enable/disable of RC6 and RPS for gen6+ platforms prior to VLV.
--- drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++------- drivers/gpu/drm/i915/intel_pm.c | 44 +++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +8 -9
@@ -1136,6 +1136,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) pm_iir =I915_READ (GEN8_GT_IIR (2 )); pm_mask =I915_READ (GEN6_PMINTRMSK ); } +seq_printf (m,"Video Turbo Mode: %s\n" , +yesno (rpmodectl &GEN6_RP_MEDIA_TURBO )); +seq_printf (m,"HW control enabled: %s\n" , +yesno (rpmodectl &GEN6_RP_ENABLE )); +seq_printf (m,"SW control enabled: %s\n" , +yesno ((rpmodectl &GEN6_RP_MEDIA_MODE_MASK ) == +GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n" , pm_ier, pm_imr, pm_isr, pm_iir, pm_mask); seq_printf(m, "pm_intrmsk_mbz: 0x%08x\n",
@@ -1479,7 +1486,7 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ; +u32 gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;int count =0 ;
@@ -1498,7 +1505,6 @@ static int gen6_drpc_info(struct seq_file *m) gt_core_status =I915_READ_FW (GEN6_GT_CORE_STATUS );trace_i915_reg_rw (false,GEN6_GT_CORE_STATUS , gt_core_status,4 , true); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL );if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE );
@@ -1509,13 +1515,6 @@ static int gen6_drpc_info(struct seq_file *m)sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids);mutex_unlock (&dev_priv->rps.hw_lock); -seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"RC1e Enabled: %s\n" ,yesno (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); seq_printf(m, "RC6 Enabled: %s\n",
drivers/gpu/drm/i915/intel_pm.c +30 -14
88 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] drm/i915: Separate RPS and RC6 handling for gen6+
Quoting Sagar Arun Kamble (2017-10-04 15:07:16)
Quoted 131 lines
This patch separates enable/disable of RC6 and RPS for gen6+ platforms prior to VLV.
Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++------- drivers/gpu/drm/i915/intel_pm.c | 44 +++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +8
-9@@ -1136,6 +1136,13 @@ static int i915_frequency_info(struct seq_file *m, void *unused) pm_iir =I915_READ (GEN8_GT_IIR (2 )); pm_mask =I915_READ (GEN6_PMINTRMSK ); } +seq_printf (m,"Video Turbo Mode: %s\n" , +yesno (rpmodectl &GEN6_RP_MEDIA_TURBO )); +seq_printf (m,"HW control enabled: %s\n" , +yesno (rpmodectl &GEN6_RP_ENABLE )); +seq_printf (m,"SW control enabled: %s\n" , +yesno ((rpmodectl &GEN6_RP_MEDIA_MODE_MASK ) == +GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n" , pm_ier, pm_imr, pm_isr, pm_iir, pm_mask); seq_printf(m, "pm_intrmsk_mbz: 0x%08x\n",@@ -1479,7 +1486,7 @@ static int vlv_drpc_info(struct seq_file *m)static int gen6_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, gt_core_status, rcctl1, rc6vids =0 ; +u32 gt_core_status, rcctl1, rc6vids =0 ;u32 gen9_powergate_enable =0 , gen9_powergate_status =0 ;unsigned forcewake_count;int count =0 ;@@ -1498,7 +1505,6 @@ static int gen6_drpc_info(struct seq_file *m) gt_core_status =I915_READ_FW (GEN6_GT_CORE_STATUS );trace_i915_reg_rw (false,GEN6_GT_CORE_STATUS , gt_core_status,4 , true); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL );if (INTEL_GEN (dev_priv) >=9 ) { gen9_powergate_enable =I915_READ (GEN9_PG_ENABLE );@@ -1509,13 +1515,6 @@ static int gen6_drpc_info(struct seq_file *m)sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids);mutex_unlock (&dev_priv->rps.hw_lock); -seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"RC1e Enabled: %s\n" ,yesno (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE)); seq_printf(m, "RC6 Enabled: %s\n",drivers/gpu/drm/i915/intel_pm.c +17
-14@@ -6326,9 +6326,13 @@ static void gen9_disable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_CONTROL ,0 ); } -static void gen6_disable_rps (struct drm_i915_private *dev_priv) +static void gen6_disable_rc6 (struct drm_i915_private *dev_priv) {I915_WRITE (GEN6_RC_CONTROL ,0 ); +} + +static void gen6_disable_rps (struct drm_i915_private *dev_priv) +{I915_WRITE (GEN6_RPNSWREQ ,1 <<31 );I915_WRITE (GEN6_RP_CONTROL ,0 ); }@@ -6686,7 +6690,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } -static void gen6_enable_rps (struct drm_i915_private *dev_priv) +static void gen6_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id;@@ -6697,12 +6701,6 @@ static void gen6_enable_rps(struct drm_i915_private *dev_priv)WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); -/* Here begins a magic sequence of register writes to enable -* auto-downclocking. -* -* Perhaps there might be some value in exposing these to -* userspace... -*/ I915_WRITE (GEN6_RC_STATE ,0 );/* Clear the DBG now so we don't confuse earlier errors */ @@ -6756,12 +6754,6 @@ static void gen6_enable_rps(struct drm_i915_private *dev_priv)GEN6_RC_CTL_EI_MODE (1 ) | GEN6_RC_CTL_HW_ENABLE); -/* Power down if completely idle for over 50ms */ -I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,50000 ); -I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); - -reset_rps (dev_priv, gen6_set_rps); - rc6vids =0 ; ret =sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids);if (IS_GEN6 (dev_priv) && ret) {@@ -6779,6 +6771,28 @@ static void gen6_enable_rps(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } + +static void gen6_enable_rps (struct drm_i915_private *dev_priv) +{ +WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); + +/* Here begins a magic sequence of register writes to enable +* auto-downclocking. +* +* Perhaps there might be some value in exposing these to +* userspace... +*/
drivers/gpu/drm/i915/intel_pm.c static void gen6_enable_rps(struct drm_i915_private *dev_priv) · line 6794
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* Power down if completely idle for over 50ms */ +I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,50000 ); +I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); + +reset_rps (dev_priv, gen6_set_rps); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +}
I was surprised it was so little, but the split looks correct.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm/i915: Separate RPS and RC6 handling for BDW
In reply to Sagar Arun KambleThis patch separates RC6 and RPS enabling for BDW. RC6/RPS Disabling are handled through gen6 functions. PM Programming guide recommends a sequence within forcewakes to configure RC6, RPS and ring frequencies in sequence. With this patch the order is still maintained.
v2: Update sequence numbers in RC6 programming and comment about intent of reset_rps during gen8_enable_rps. (Radoslaw)
--- drivers/gpu/drm/i915/intel_pm.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +15 -14
@@ -6613,7 +6613,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } -static void gen8_enable_rps (struct drm_i915_private *dev_priv) +static void gen8_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id;
@@ -6622,7 +6622,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)/* 1a: Software RC state - RC0 */ I915_WRITE (GEN6_RC_STATE ,0 ); -/* 1c & 1d: Get forcewake during program sequence. Although the driver +/* 1b: Get forcewake during program sequence. Although the driver * hasn't enabled a state yet where we need forcewake, BIOS may have.*/ intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );
@@ -6645,16 +6645,18 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); -if (IS_BROADWELL (dev_priv)) -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN7_RC_CTL_TO_MODE | - rc6_mask); -else -I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN6_RC_CTL_EI_MODE (1 ) | - rc6_mask); +I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | +GEN7_RC_CTL_TO_MODE | + rc6_mask); -/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void gen8_enable_rps (struct drm_i915_private *dev_priv) +{ +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1 Program defaults and thresholds for RPS*/ I915_WRITE (GEN6_RPNSWREQ ,HSW_FREQUENCY (dev_priv->rps.rp1_freq)); I915_WRITE(GEN6_RC_VIDEO_FREQ,
@@ -6674,7 +6676,7 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); -/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_TURBO | GEN6_RP_MEDIA_HW_NORMAL_MODE |
@@ -6683,8 +6685,6 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)GEN6_RP_UP_BUSY_AVG | GEN6_RP_DOWN_IDLE_AVG); -/* 6: Ring frequency + overclocking (our driver does this later */ -reset_rps (dev_priv, gen6_set_rps);intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );
@@ -7976,6 +7976,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv))gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) { +gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv);gen6_update_ring_freq (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/10] drm/i915: Separate RPS and RC6 handling for BDW
Quoting Sagar Arun Kamble (2017-10-04 15:07:17)
Quoted 20 lines
This patch separates RC6 and RPS enabling for BDW. RC6/RPS Disabling are handled through gen6 functions. PM Programming guide recommends a sequence within forcewakes to configure RC6, RPS and ring frequencies in sequence. With this patch the order is still maintained.
v2: Update sequence numbers in RC6 programming and comment about intent of
reset_rpsduringgen8_enable_rps. (Radoslaw)Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>---
drivers/gpu/drm/i915/intel_pm.c +0
-1@@ -6645,16 +6645,18 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); -if (IS_BROADWELL (dev_priv))
drivers/gpu/drm/i915/intel_pm.c static void gen8_enable_rps(struct drm_i915_private *dev_priv) · line 6650
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +3
-7-I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | -GEN7_RC_CTL_TO_MODE | - rc6_mask); - else - I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE | - GEN6_RC_CTL_EI_MODE(1) | - rc6_mask); +I915_WRITE (GEN6_RC_CONTROL ,GEN6_RC_CTL_HW_ENABLE | +GEN7_RC_CTL_TO_MODE | + rc6_mask);
Ah, presumably you noted that this function is only called for bdw. Please make this a separate patch, and fixup the earlier IS_BROADWELL as well.
The rest of the patch makes sense,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915: Separate RPS and RC6 handling for VLV
In reply to Sagar Arun KambleThis patch separates enable/disable of RC6 and RPS for VLV.
v2: Removed unnecessary comments about forcewakes while enabling RC6/RPS. Added changes to output turbo control status for VLV in i915_frequency_info.
--- drivers/gpu/drm/i915/i915_debugfs.c | 24 +++++++-------- drivers/gpu/drm/i915/intel_pm.c | 61 ++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +12 -12
@@ -1041,9 +1041,19 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { -u32 freq_sts; +u32 rpmodectl, freq_sts;mutex_lock (&dev_priv->rps.hw_lock); + + rpmodectl =I915_READ (GEN6_RP_CONTROL ); +seq_printf (m,"Video Turbo Mode: %s\n" , +yesno (rpmodectl &GEN6_RP_MEDIA_TURBO )); +seq_printf (m,"HW control enabled: %s\n" , +yesno (rpmodectl &GEN6_RP_ENABLE )); +seq_printf (m,"SW control enabled: %s\n" , +yesno ((rpmodectl &GEN6_RP_MEDIA_MODE_MASK ) == +GEN6_RP_MEDIA_SW_MODE )); + freq_sts =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS );seq_printf (m,"PUNIT_REG_GPU_FREQ_STS: 0x%08x\n" , freq_sts);seq_printf (m,"DDR freq: %d MHz\n" , dev_priv->mem_freq);
@@ -1454,21 +1464,11 @@ static void print_rc6_res(struct seq_file *m,static int vlv_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, rcctl1, pw_status; +u32 rcctl1, pw_status; pw_status =I915_READ (VLV_GTLC_PW_STATUS ); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL ); -seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"Turbo enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 & (GEN7_RC_CTL_TO_MODE |GEN6_RC_CTL_EI_MODE (1 ))));
drivers/gpu/drm/i915/intel_pm.c +39 -22
118 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 03/10] drm/i915: Separate RPS and RC6 handling for VLV
Quoting Sagar Arun Kamble (2017-10-04 15:07:18)
Quoted 51 lines
This patch separates enable/disable of RC6 and RPS for VLV.
v2: Removed unnecessary comments about forcewakes while enabling RC6/RPS. Added changes to output turbo control status for VLV in
i915_frequency_info.Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 24 +++++++-------- drivers/gpu/drm/i915/intel_pm.c | 61 ++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +12
-3@@ -1041,9 +1041,19 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Current P-state: %d\n" , (rgvstat &MEMSTAT_PSTATE_MASK ) >>MEMSTAT_PSTATE_SHIFT ); }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { -u32 freq_sts; +u32 rpmodectl, freq_sts;mutex_lock (&dev_priv->rps.hw_lock); + + rpmodectl =I915_READ (GEN6_RP_CONTROL ); +seq_printf (m,"Video Turbo Mode: %s\n" , +yesno (rpmodectl &GEN6_RP_MEDIA_TURBO )); +seq_printf (m,"HW control enabled: %s\n" , +yesno (rpmodectl &GEN6_RP_ENABLE )); +seq_printf (m,"SW control enabled: %s\n" , +yesno ((rpmodectl &GEN6_RP_MEDIA_MODE_MASK ) == +GEN6_RP_MEDIA_SW_MODE )); + freq_sts =vlv_punit_read (dev_priv,PUNIT_REG_GPU_FREQ_STS );seq_printf (m,"PUNIT_REG_GPU_FREQ_STS: 0x%08x\n" , freq_sts);seq_printf (m,"DDR freq: %d MHz\n" , dev_priv->mem_freq);@@ -1454,21 +1464,11 @@ static void print_rc6_res(struct seq_file *m,static int vlv_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -u32 rpmodectl1, rcctl1, pw_status; +u32 rcctl1, pw_status; pw_status =I915_READ (VLV_GTLC_PW_STATUS ); - rpmodectl1 =I915_READ (GEN6_RP_CONTROL ); rcctl1 =I915_READ (GEN6_RC_CONTROL );
drivers/gpu/drm/i915/i915_debugfs.c static void print_rc6_res(struct seq_file *m, · line 1471
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-9-seq_printf (m,"Video Turbo Mode: %s\n" , -yesno (rpmodectl1 &GEN6_RP_MEDIA_TURBO )); -seq_printf (m,"Turbo enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"HW control enabled: %s\n" , -yesno (rpmodectl1 &GEN6_RP_ENABLE )); -seq_printf (m,"SW control enabled: %s\n" , -yesno ((rpmodectl1 &GEN6_RP_MEDIA_MODE_MASK ) == -GEN6_RP_MEDIA_SW_MODE ));
Ok. Redundant, and this file does focus on render power control and not render power states.
Quoted 104 lines
drivers/gpu/drm/i915/i915_debugfs.c +0
-0seq_printf (m,"RC6 Enabled: %s\n" ,yesno (rcctl1 & (GEN7_RC_CTL_TO_MODE |GEN6_RC_CTL_EI_MODE (1 ))));drivers/gpu/drm/i915/intel_pm.c +27
-22@@ -6342,9 +6342,9 @@ static void cherryview_disable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC_CONTROL ,0 ); } -static void valleyview_disable_rps (struct drm_i915_private *dev_priv) +static void valleyview_disable_rc6 (struct drm_i915_private *dev_priv) { -/* we're doing forcewake before Disabling RC6, +/* We're doing forcewake before Disabling RC6, * This what the BIOS expects when going into suspend */ intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );@@ -6353,6 +6353,11 @@ static void valleyview_disable_rps(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } +static void valleyview_disable_rps (struct drm_i915_private *dev_priv) +{ +I915_WRITE (GEN6_RP_CONTROL ,0 ); +} +static void intel_print_rc6_info (struct drm_i915_private *dev_priv,u32 mode) {if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {@@ -7278,11 +7283,11 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); } -static void valleyview_enable_rps (struct drm_i915_private *dev_priv) +static void valleyview_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id; -u32 gtfifodbg, val, rc6_mode =0 ; +u32 gtfifodbg, rc6_mode =0 ;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));@@ -7295,28 +7300,11 @@ static void valleyview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GTFIFODBG , gtfifodbg); } -/* If VLV, Forcewake all wells, else re-direct to regular path */ intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* Disable RC states. */ I915_WRITE (GEN6_RC_CONTROL ,0 ); -I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,1000000 ); -I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 ); -I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 ); -I915_WRITE (GEN6_RP_UP_EI ,66000 ); -I915_WRITE (GEN6_RP_DOWN_EI ,350000 ); - -I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); - -I915_WRITE (GEN6_RP_CONTROL , -GEN6_RP_MEDIA_TURBO | -GEN6_RP_MEDIA_HW_NORMAL_MODE | -GEN6_RP_MEDIA_IS_GFX | -GEN6_RP_ENABLE | -GEN6_RP_UP_BUSY_AVG | -GEN6_RP_DOWN_IDLE_CONT ); -I915_WRITE (GEN6_RC6_WAKE_RATE_LIMIT ,0x00280000 );I915_WRITE (GEN6_RC_EVALUATION_INTERVAL ,125000 );I915_WRITE (GEN6_RC_IDLE_HYSTERSIS ,25 );@@ -7326,7 +7314,7 @@ static void valleyview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6_THRESHOLD ,0x557 ); -/* allows RC6 residency counter to work */ +/* Allows RC6 residency counter to work */ I915_WRITE(VLV_COUNTER_CONTROL, _MASKED_BIT_ENABLE(VLV_COUNT_RANGE_HIGH | VLV_MEDIA_RC0_COUNT_EN |@@ -7341,6 +7329,33 @@ static void valleyview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC_CONTROL , rc6_mode); +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void valleyview_enable_rps (struct drm_i915_private *dev_priv) +{ +u32 val; + +WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,1000000 ); +I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 ); +I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 ); +I915_WRITE (GEN6_RP_UP_EI ,66000 ); +I915_WRITE (GEN6_RP_DOWN_EI ,350000 ); +
drivers/gpu/drm/i915/intel_pm.c static void valleyview_enable_rps(struct drm_i915_private *dev_priv) · line 7358
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +10
-0+I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); + +I915_WRITE (GEN6_RP_CONTROL , +GEN6_RP_MEDIA_TURBO | +GEN6_RP_MEDIA_HW_NORMAL_MODE | +GEN6_RP_MEDIA_IS_GFX | +GEN6_RP_ENABLE | +GEN6_RP_UP_BUSY_AVG | +GEN6_RP_DOWN_IDLE_CONT ); +
Oh, vlv just has to be different. Poke it too hard and it bites back.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/i915: Separate RPS and RC6 handling for CHV
In reply to Sagar Arun KambleThis patch separates enable/disable of RC6 and RPS for CHV.
v2: Fixed comment.
--- drivers/gpu/drm/i915/intel_pm.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +25 -6
@@ -6337,11 +6337,16 @@ static void gen6_disable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_CONTROL ,0 ); } -static void cherryview_disable_rps (struct drm_i915_private *dev_priv) +static void cherryview_disable_rc6 (struct drm_i915_private *dev_priv) {I915_WRITE (GEN6_RC_CONTROL ,0 ); } +static void cherryview_disable_rps (struct drm_i915_private *dev_priv) +{ +I915_WRITE (GEN6_RP_CONTROL ,0 ); +} +static void valleyview_disable_rc6 (struct drm_i915_private *dev_priv) {/* We're doing forcewake before Disabling RC6,
@@ -7194,11 +7199,11 @@ static void valleyview_cleanup_gt_powersave(struct drm_i915_private *dev_priv)valleyview_cleanup_pctx (dev_priv); } -static void cherryview_enable_rps (struct drm_i915_private *dev_priv) +static void cherryview_enable_rc6 (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;enum intel_engine_id id; -u32 gtfifodbg, val, rc6_mode =0 , pcbr; +u32 gtfifodbg, rc6_mode =0 , pcbr;WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock));
@@ -7231,7 +7236,7 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)/* TO threshold set to 500 us ( 0x186 * 1.28 us) */ I915_WRITE (GEN6_RC6_THRESHOLD ,0x186 ); -/* allows RC6 residency counter to work */ +/* Allows RC6 residency counter to work */ I915_WRITE(VLV_COUNTER_CONTROL, _MASKED_BIT_ENABLE(VLV_COUNT_RANGE_HIGH | VLV_MEDIA_RC6_COUNT_EN |
@@ -7247,7 +7252,19 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC_CONTROL , rc6_mode); -/* 4 Program defaults and thresholds for RPS*/ +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); +} + +static void cherryview_enable_rps (struct drm_i915_private *dev_priv) +{ +u32 val; + +WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); + + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* 1: Program defaults and thresholds for RPS*/ I915_WRITE (GEN6_RP_DOWN_TIMEOUT ,1000000 );I915_WRITE (GEN6_RP_UP_THRESHOLD ,59400 );I915_WRITE (GEN6_RP_DOWN_THRESHOLD ,245000 );
@@ -7256,7 +7273,7 @@ static void cherryview_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); -/* 5: Enable RPS */ +/* 2: Enable RPS */ I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_HW_NORMAL_MODE | GEN6_RP_MEDIA_IS_GFX |
@@ -7953,6 +7970,7 @@ void intel_disable_gt_powersave(struct drm_i915_private *dev_priv)gen9_disable_rc6 (dev_priv);gen9_disable_rps (dev_priv); }else if (IS_CHERRYVIEW (dev_priv)) { +cherryview_disable_rc6 (dev_priv);cherryview_disable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_disable_rc6 (dev_priv);
@@ -7983,6 +8001,7 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv)mutex_lock (&dev_priv->rps.hw_lock);if (IS_CHERRYVIEW (dev_priv)) { +cherryview_enable_rc6 (dev_priv);cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) {valleyview_enable_rc6 (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/10] drm/i915: Separate RPS and RC6 handling for CHV
Quoting Sagar Arun Kamble (2017-10-04 15:07:19)
Quoted 9 lines
This patch separates enable/disable of RC6 and RPS for CHV.
v2: Fixed comment.
Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm"
In reply to Sagar Arun KambleWill be using pm for state containing RPS/RC6 state in the next patch.
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++-- drivers/gpu/drm/i915/i915_irq.c | 8 ++++---- drivers/gpu/drm/i915/intel_drv.h | 10 +++++----- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -2523,12 +2523,12 @@ static int intel_runtime_suspend(struct device *kdev)intel_uncore_suspend (dev_priv);enable_rpm_wakeref_asserts (dev_priv); -WARN_ON_ONCE (atomic_read (&dev_priv->pm.wakeref_count)); +WARN_ON_ONCE (atomic_read (&dev_priv->rpm.wakeref_count));if (intel_uncore_arm_unclaimed_mmio_detection (dev_priv))DRM_ERROR ("Unclaimed access detected prior to suspending\n" ); - dev_priv->pm.suspended = true; + dev_priv->rpm.suspended = true;/* * FIXME: We really should find a document that references the arguments
@@ -2574,11 +2574,11 @@ static int intel_runtime_resume(struct device *kdev)DRM_DEBUG_KMS ("Resuming device\n" ); -WARN_ON_ONCE (atomic_read (&dev_priv->pm.wakeref_count)); +WARN_ON_ONCE (atomic_read (&dev_priv->rpm.wakeref_count));disable_rpm_wakeref_asserts (dev_priv);intel_opregion_notify_adapter (dev_priv,PCI_D0 ); - dev_priv->pm.suspended = false; + dev_priv->rpm.suspended = false;if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" );
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2519,7 +2519,7 @@ struct drm_i915_private {bool distrust_bios_wm; } wm; -struct i915_runtime_pm pm; +struct i915_runtime_pm rpm;struct {bool initialized;
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1672,8 +1672,8 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv, struct i915_gpu_state *error) { error->awake = dev_priv->gt.awake; - error->wakelock =atomic_read (&dev_priv->pm.wakeref_count); - error->suspended = dev_priv->pm.suspended; + error->wakelock =atomic_read (&dev_priv->rpm.wakeref_count); + error->suspended = dev_priv->rpm.suspended; error->iommu =-1 ;#ifdef CONFIG_INTEL_IOMMU
drivers/gpu/drm/i915/i915_irq.c +4 -4
@@ -4166,7 +4166,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv)* interrupts as enabled _before_ actually enabling them to avoid * special cases in our ordering checks. */ - dev_priv->pm.irqs_enabled = true; + dev_priv->rpm.irqs_enabled = true;return drm_irq_install (&dev_priv->drm, dev_priv->drm.pdev->irq); }
@@ -4182,7 +4182,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) {drm_irq_uninstall (&dev_priv->drm);intel_hpd_cancel_work (dev_priv); - dev_priv->pm.irqs_enabled = false; + dev_priv->rpm.irqs_enabled = false; }/**
@@ -4195,7 +4195,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv)void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv) { dev_priv->drm.driver->irq_uninstall (&dev_priv->drm); - dev_priv->pm.irqs_enabled = false; + dev_priv->rpm.irqs_enabled = false;synchronize_irq (dev_priv->drm.irq); }
@@ -4208,7 +4208,7 @@ void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)*/ void intel_runtime_pm_enable_interrupts (struct drm_i915_private *dev_priv) { - dev_priv->pm.irqs_enabled = true; + dev_priv->rpm.irqs_enabled = true; dev_priv->drm.driver->irq_preinstall (&dev_priv->drm); dev_priv->drm.driver->irq_postinstall (&dev_priv->drm); }
drivers/gpu/drm/i915/intel_drv.h +5 -5
@@ -1254,7 +1254,7 @@ static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv)* We only use drm_irq_uninstall() at unload and VT switch, so * this is the only thing we need to check. */ -return dev_priv->pm.irqs_enabled; +return dev_priv->rpm.irqs_enabled; }int intel_get_crtc_scanline (struct intel_crtc *crtc);
@@ -1790,7 +1790,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void assert_rpm_device_not_suspended (struct drm_i915_private *dev_priv) { -WARN_ONCE (dev_priv->pm.suspended, +WARN_ONCE (dev_priv->rpm.suspended,"Device suspended during HW access\n" ); }
@@ -1798,7 +1798,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) {assert_rpm_device_not_suspended (dev_priv); -WARN_ONCE (!atomic_read (&dev_priv->pm.wakeref_count), +WARN_ONCE (!atomic_read (&dev_priv->rpm.wakeref_count),"RPM wakelock ref not held during HW access" ); }
@@ -1823,7 +1823,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void disable_rpm_wakeref_asserts (struct drm_i915_private *dev_priv) { -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count); }/**
@@ -1840,7 +1840,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,static inline void enable_rpm_wakeref_asserts (struct drm_i915_private *dev_priv) { -atomic_dec (&dev_priv->pm.wakeref_count); +atomic_dec (&dev_priv->rpm.wakeref_count); }void intel_runtime_pm_get (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -9347,8 +9347,8 @@ void intel_pm_setup(struct drm_i915_private *dev_priv) __intel_autoenable_gt_powersave);atomic_set (&dev_priv->rps.num_waiters,0 ); - dev_priv->pm.suspended = false; -atomic_set (&dev_priv->pm.wakeref_count,0 ); + dev_priv->rpm.suspended = false; +atomic_set (&dev_priv->rpm.wakeref_count,0 ); } static u64 vlv_residency_raw(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_runtime_pm.c +5 -5
@@ -187,7 +187,7 @@ bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,struct i915_power_well *power_well;bool is_enabled; -if (dev_priv->pm.suspended) +if (dev_priv->rpm.suspended)return false; is_enabled = true;
@@ -3125,7 +3125,7 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv) ret =pm_runtime_get_sync (kdev);WARN_ONCE (ret <0 ,"pm_runtime_get_sync() failed: %d\n" , ret); -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count);assert_rpm_wakelock_held (dev_priv); }
@@ -3159,7 +3159,7 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)return false; } -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count);assert_rpm_wakelock_held (dev_priv);return true;
@@ -3190,7 +3190,7 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)assert_rpm_wakelock_held (dev_priv);pm_runtime_get_noresume (kdev); -atomic_inc (&dev_priv->pm.wakeref_count); +atomic_inc (&dev_priv->rpm.wakeref_count); }/**
@@ -3207,7 +3207,7 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)struct device *kdev = &pdev->dev;assert_rpm_wakelock_held (dev_priv); -atomic_dec (&dev_priv->pm.wakeref_count); +atomic_dec (&dev_priv->rpm.wakeref_count);pm_runtime_mark_last_busy (kdev);pm_runtime_put_autosuspend (kdev);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/10] drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm"
Quoting Sagar Arun Kamble (2017-10-04 15:07:20)
Quoted 1 line
Will be using pm for state containing RPS/RC6 state in the next patch.
Wait, so what does rpm mean? Runtime power management (the exist use of the acronym) or render power management?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byRe: [PATCH 05/10] drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm"
Quoting Chris Wilson (2017-10-05 18:44:14)
Quoted 5 lines
Quoting Sagar Arun Kamble (2017-10-04 15:07:20)
Quoted 1 line
Will be using pm for state containing RPS/RC6 state in the next patch.
Wait, so what does rpm mean? Runtime power management (the exist use of the acronym) or render power management?
Patch looks fine, I just need a few more words here to overcome the confusion of abbreviations.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915: Name structure in dev_priv that contains RPS/RC6 state as "pm"
In reply to Sagar Arun KamblePrepared substructure rps for RPS related state. autoenable_work and pcu_lock are used for RC6 hence they are defined outside rps structure. Renamed the RPS lock as pcu_lock.
v2: Rebase.
--- drivers/gpu/drm/i915/i915_debugfs.c | 117 +++++----- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 12 +- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_guc_submission.c | 8 +- drivers/gpu/drm/i915/i915_irq.c | 86 +++---- drivers/gpu/drm/i915/i915_sysfs.c | 70 +++--- drivers/gpu/drm/i915/intel_cdclk.c | 40 ++-- drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 363 +++++++++++++++-------------- drivers/gpu/drm/i915/intel_runtime_pm.c | 16 +- drivers/gpu/drm/i915/intel_sideband.c | 6 +- 13 files changed, 379 insertions(+), 357 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +59 -58
@@ -1026,6 +1026,7 @@ static int i915_error_state_open(struct inode *inode, struct file *file)static int i915_frequency_info (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct intel_rps *rps = &dev_priv->pm.rps;int ret =0 ;intel_runtime_pm_get (dev_priv);
@@ -1043,7 +1044,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 rpmodectl, freq_sts; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); rpmodectl =I915_READ (GEN6_RP_CONTROL ); seq_printf(m, "Video Turbo Mode: %s\n",
@@ -1062,21 +1063,21 @@ static int i915_frequency_info(struct seq_file *m, void *unused) intel_gpu_freq(dev_priv, (freq_sts >> 8) & 0xff));seq_printf (m,"current GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m,"max GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"min GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq)); +intel_gpu_freq (dev_priv, rps->min_freq));seq_printf (m,"idle GPU freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq));seq_printf (m,"efficient (RPe) frequency: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); -mutex_unlock (&dev_priv->rps.hw_lock); +intel_gpu_freq (dev_priv, rps->efficient_freq)); +mutex_unlock (&dev_priv->pm.pcu_lock); }else if (INTEL_GEN (dev_priv) >=6 ) {u32 rp_state_limits;u32 gt_perf_status;
@@ -1156,7 +1157,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"PM IER=0x%08x IMR=0x%08x ISR=0x%08x IIR=0x%08x, MASK=0x%08x\n" , pm_ier, pm_imr, pm_isr, pm_iir, pm_mask);seq_printf (m,"pm_intrmsk_mbz: 0x%08x\n" , - dev_priv->rps.pm_intrmsk_mbz); + rps->pm_intrmsk_mbz);seq_printf (m,"GT_PERF_STATUS: 0x%08x\n" , gt_perf_status);seq_printf (m,"Render p-state ratio: %d\n" , (gt_perf_status & (INTEL_GEN (dev_priv) >=9 ?0x1ff00 :0xff00 )) >>8 );
@@ -1176,8 +1177,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpcurup, GT_PM_INTERVAL_TO_US(dev_priv, rpcurup));seq_printf (m,"RP PREV UP: %d (%dus)\n" , rpprevup,GT_PM_INTERVAL_TO_US (dev_priv, rpprevup)); -seq_printf (m,"Up threshold: %d%%\n" , - dev_priv->rps.up_threshold); +seq_printf (m,"Up threshold: %d%%\n" , rps->up_threshold);seq_printf (m,"RP CUR DOWN EI: %d (%dus)\n" , rpdownei,GT_PM_INTERVAL_TO_US (dev_priv, rpdownei));
@@ -1185,8 +1185,7 @@ static int i915_frequency_info(struct seq_file *m, void *unused) rpcurdown, GT_PM_INTERVAL_TO_US(dev_priv, rpcurdown));seq_printf (m,"RP PREV DOWN: %d (%dus)\n" , rpprevdown,GT_PM_INTERVAL_TO_US (dev_priv, rpprevdown)); -seq_printf (m,"Down threshold: %d%%\n" , - dev_priv->rps.down_threshold); +seq_printf (m,"Down threshold: %d%%\n" , rps->down_threshold); max_freq = (IS_GEN9_LP (dev_priv) ? rp_state_cap >>0 : rp_state_cap >>16 ) &0xff ;
@@ -1208,22 +1207,22 @@ static int i915_frequency_info(struct seq_file *m, void *unused)seq_printf (m,"Max non-overclocked (RP0) frequency: %dMHz\n" ,intel_gpu_freq (dev_priv, max_freq));seq_printf (m,"Max overclocked frequency: %dMHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"Current freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m,"Actual freq: %d MHz\n" , cagf);seq_printf (m,"Idle freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq));seq_printf (m,"Min freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq)); +intel_gpu_freq (dev_priv, rps->min_freq));seq_printf (m,"Boost freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.boost_freq)); +intel_gpu_freq (dev_priv, rps->boost_freq));seq_printf (m,"Max freq: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m,"efficient (RPe) frequency: %d MHz\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq)); +intel_gpu_freq (dev_priv, rps->efficient_freq)); }else {seq_puts (m,"no P-state info available\n" ); }
@@ -1511,9 +1510,9 @@ static int gen6_drpc_info(struct seq_file *m) gen9_powergate_status =I915_READ (GEN9_PWRGT_DOMAIN_STATUS ); } -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_read (dev_priv,GEN6_PCODE_READ_RC6VIDS , &rc6vids); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);seq_printf (m,"RC1e Enabled: %s\n" ,yesno (rcctl1 & GEN6_RC_CTL_RC1e_ENABLE));
@@ -1788,19 +1787,19 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret) goto out;if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) {/* Convert GT frequency to 50 HZ units */ min_gpu_freq = - dev_priv->rps.min_freq_softlimit /GEN9_FREQ_SCALER ; + dev_priv->pm.rps.min_freq_softlimit /GEN9_FREQ_SCALER ; max_gpu_freq = - dev_priv->rps.max_freq_softlimit /GEN9_FREQ_SCALER ; + dev_priv->pm.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; + min_gpu_freq = dev_priv->pm.rps.min_freq_softlimit; + max_gpu_freq = dev_priv->pm.rps.max_freq_softlimit; }seq_puts (m,"GPU freq (MHz)\tEffective CPU freq (MHz)\tEffective Ring freq (MHz)\n" );
@@ -1819,7 +1818,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) ((ia_freq >> 8) & 0xff) * 100); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); out:intel_runtime_pm_put (dev_priv);
@@ -2253,25 +2252,26 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);struct drm_device *dev = &dev_priv->drm; +struct intel_rps *rps = &dev_priv->pm.rps;struct drm_file *file; -seq_printf (m,"RPS enabled? %d\n" , dev_priv->rps.enabled); +seq_printf (m,"RPS enabled? %d\n" , rps->enabled);seq_printf (m,"GPU busy? %s [%d requests]\n" ,yesno (dev_priv->gt.awake), dev_priv->gt.active_requests);seq_printf (m,"CPU waiting? %d\n" ,count_irq_waiters (dev_priv));seq_printf (m,"Boosts outstanding? %d\n" , -atomic_read (&dev_priv->rps.num_waiters)); +atomic_read (&rps->num_waiters));seq_printf (m,"Frequency requested %d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.cur_freq)); +intel_gpu_freq (dev_priv, rps->cur_freq));seq_printf (m," min hard:%d, soft:%d; max soft:%d, hard:%d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit), -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit), -intel_gpu_freq (dev_priv, dev_priv->rps.max_freq)); +intel_gpu_freq (dev_priv, rps->min_freq), +intel_gpu_freq (dev_priv, rps->min_freq_softlimit), +intel_gpu_freq (dev_priv, rps->max_freq_softlimit), +intel_gpu_freq (dev_priv, rps->max_freq));seq_printf (m," idle:%d, efficient:%d, boost:%d\n" , -intel_gpu_freq (dev_priv, dev_priv->rps.idle_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.efficient_freq), -intel_gpu_freq (dev_priv, dev_priv->rps.boost_freq)); +intel_gpu_freq (dev_priv, rps->idle_freq), +intel_gpu_freq (dev_priv, rps->efficient_freq), +intel_gpu_freq (dev_priv, rps->boost_freq));mutex_lock (&dev->filelist_mutex);list_for_each_entry_reverse (file, &dev->filelist, lhead) {
@@ -2287,11 +2287,11 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)rcu_read_unlock (); }seq_printf (m,"Kernel (anonymous) boosts: %d\n" , -atomic_read (&dev_priv->rps.boosts)); +atomic_read (&rps->boosts));mutex_unlock (&dev->filelist_mutex);if (INTEL_GEN (dev_priv) >=6 && - dev_priv->rps.enabled && + rps->enabled && dev_priv->gt.active_requests) {u32 rpup, rpupei;u32 rpdown, rpdownei;
@@ -2304,13 +2304,13 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL );seq_printf (m,"\nRPS Autotuning (current \"%s\" window):\n" , -rps_power_to_str (dev_priv->rps.power)); +rps_power_to_str (rps->power));seq_printf (m," Avg. up: %d%% [above threshold? %d%%]\n" , rpup && rpupei ?100 * rpup / rpupei :0 , - dev_priv->rps.up_threshold); + rps->up_threshold);seq_printf (m," Avg. down: %d%% [below threshold? %d%%]\n" , rpdown && rpdownei ?100 * rpdown / rpdownei :0 , - dev_priv->rps.down_threshold); + rps->down_threshold); }else {seq_puts (m,"\nRPS Autotuning inactive\n" ); }
@@ -4391,7 +4391,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->rps.max_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.max_freq_softlimit);return 0 ; }
@@ -4399,6 +4399,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, i915_max_freq_set(void *data, u64 val) {struct drm_i915_private *dev_priv = data; +struct intel_rps *rps = &dev_priv->pm.rps;u32 hw_max, hw_min;int ret;
@@ -4407,7 +4408,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting max freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret)return ret;
@@ -4416,20 +4417,20 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,*/ val =intel_freq_opcode (dev_priv, val); - hw_max = dev_priv->rps.max_freq; - hw_min = dev_priv->rps.min_freq; + hw_max = rps->max_freq; + hw_min = rps->min_freq; -if (val < hw_min || val > hw_max || val < dev_priv->rps.min_freq_softlimit) { -mutex_unlock (&dev_priv->rps.hw_lock); +if (val < hw_min || val > hw_max || val < rps->min_freq_softlimit) { +mutex_unlock (&dev_priv->pm.pcu_lock);return -EINVAL ; } - dev_priv->rps.max_freq_softlimit = val; + rps->max_freq_softlimit = val;if (intel_set_rps (dev_priv, val))DRM_DEBUG_DRIVER ("failed to update RPS to new softlimit\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return 0 ; }
@@ -4446,7 +4447,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,if (INTEL_GEN (dev_priv) <6 )return -ENODEV ; - *val =intel_gpu_freq (dev_priv, dev_priv->rps.min_freq_softlimit); + *val =intel_gpu_freq (dev_priv, dev_priv->pm.rps.min_freq_softlimit);return 0 ; }
@@ -4462,7 +4463,7 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,DRM_DEBUG_DRIVER ("Manually setting min freq to %llu\n" , val); - ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); + ret =mutex_lock_interruptible (&dev_priv->pm.pcu_lock);if (ret)return ret;
@@ -4471,21 +4472,21 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,*/ val =intel_freq_opcode (dev_priv, val); - hw_max = dev_priv->rps.max_freq; - hw_min = dev_priv->rps.min_freq; + hw_max = dev_priv->pm.rps.max_freq; + hw_min = dev_priv->pm.rps.min_freq;if (val < hw_min || - val > hw_max || val > dev_priv->rps.max_freq_softlimit) { -mutex_unlock (&dev_priv->rps.hw_lock); + val > hw_max || val > dev_priv->pm.rps.max_freq_softlimit) { +mutex_unlock (&dev_priv->pm.pcu_lock);return -EINVAL ; } - dev_priv->rps.min_freq_softlimit = val; + dev_priv->pm.rps.min_freq_softlimit = val;if (intel_set_rps (dev_priv, val))DRM_DEBUG_DRIVER ("failed to update RPS to new softlimit\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2481,7 +2481,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_drv.h +8 -4
@@ -1311,7 +1311,7 @@ struct intel_rps_ei {u32 media_c0; }; -struct intel_gen6_power_mgmt { +struct intel_rps {/* * work, interrupts_enabled and pm_iir are protected by * dev_priv->irq_lock
@@ -1352,12 +1352,16 @@ struct intel_gen6_power_mgmt {enum {LOW_POWER ,BETWEEN ,HIGH_POWER } power;bool enabled; -struct delayed_work autoenable_work;atomic_t num_waiters;atomic_t boosts;/* manual wa residency calculations */ struct intel_rps_ei ei; +}; + +struct intel_gen6_power_mgmt { +struct intel_rps rps; +struct delayed_work autoenable_work;/* * Protects RPS/RC6 register access and PCU communication.
@@ -1365,7 +1369,7 @@ struct intel_gen6_power_mgmt {* this lock may be held for long periods of time when * talking to hw - so only take it when talking to hw! */ -struct mutex hw_lock; +struct mutex pcu_lock; };/* defined intel_pm.c */
@@ -2408,7 +2412,7 @@ struct drm_i915_private {u32 edram_cap;/* gen6+ rps state */ -struct intel_gen6_power_mgmt rps; +struct intel_gen6_power_mgmt pm;/* ilk-only ips/rps state. Everything in here is protected by the global * mchdev_lock in intel_pm.c */
drivers/gpu/drm/i915/i915_gem_request.c +1 -1
@@ -416,7 +416,7 @@ static void i915_gem_request_retire(struct drm_i915_gem_request *request)spin_lock_irq (&request->lock);if (request->waitboost) -atomic_dec (&request->i915->rps.num_waiters); +atomic_dec (&request->i915->pm.rps.num_waiters);dma_fence_signal_locked (&request->fence);spin_unlock_irq (&request->lock);
drivers/gpu/drm/i915/i915_guc_submission.c +4 -4
@@ -1105,8 +1105,8 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv)* Here we CLEAR REDIRECT_TO_GUC bit in pm_intrmsk_mbz, which will * result in the register bit being left SET! */ - dev_priv->rps.pm_intrmsk_mbz |=ARAT_EXPIRED_INTRMSK ; - dev_priv->rps.pm_intrmsk_mbz &= ~GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; + dev_priv->pm.rps.pm_intrmsk_mbz |=ARAT_EXPIRED_INTRMSK ; + dev_priv->pm.rps.pm_intrmsk_mbz &= ~GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; }static void guc_interrupts_release (struct drm_i915_private *dev_priv)
@@ -1129,8 +1129,8 @@ static void guc_interrupts_release(struct drm_i915_private *dev_priv)I915_WRITE (GUC_VCS2_VCS1_IER ,0 );I915_WRITE (GUC_WD_VECS_IER ,0 ); - dev_priv->rps.pm_intrmsk_mbz |=GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; - dev_priv->rps.pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK ; + dev_priv->pm.rps.pm_intrmsk_mbz |=GEN8_PMINTR_DISABLE_REDIRECT_TO_GUC ; + dev_priv->pm.rps.pm_intrmsk_mbz &= ~ARAT_EXPIRED_INTRMSK ; }int i915_guc_submission_enable (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_irq.c +45 -41
223 lines not on this page · raw message
drivers/gpu/drm/i915/i915_sysfs.c +35 -35
171 lines not on this page · raw message
drivers/gpu/drm/i915/intel_cdclk.c +20 -20
@@ -503,7 +503,7 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv,else cmd =0 ; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); val =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ); val &= ~DSPFREQGUAR_MASK ; val |= (cmd <<DSPFREQGUAR_SHIFT );
@@ -513,7 +513,7 @@ static void vlv_set_cdclk(struct drm_i915_private *dev_priv, 50)) {DRM_ERROR ("timed out waiting for CDclk change\n" ); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);mutex_lock (&dev_priv->sb_lock);
@@ -590,7 +590,7 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv,*/ cmd =DIV_ROUND_CLOSEST (dev_priv->hpll_freq <<1 , cdclk) -1 ; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); val =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ); val &= ~DSPFREQGUAR_MASK_CHV ; val |= (cmd <<DSPFREQGUAR_SHIFT_CHV );
@@ -600,7 +600,7 @@ static void chv_set_cdclk(struct drm_i915_private *dev_priv, 50)) {DRM_ERROR ("timed out waiting for CDclk change\n" ); } -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv);
@@ -656,10 +656,10 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv, "trying to change cdclk frequency with cdclk not enabled\n")) return; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,BDW_PCODE_DISPLAY_FREQ_CHANGE_REQ ,0x0 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("failed to inform pcode about cdclk change\n" );return ;
@@ -712,9 +712,9 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv, LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))DRM_ERROR ("Switching back to LCPLL failed\n" ); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , data); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);I915_WRITE (CDCLK_FREQ ,DIV_ROUND_CLOSEST (cdclk,1000 ) -1 );
@@ -928,12 +928,12 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,WARN_ON ((cdclk ==24000 ) != (vco ==0 )); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =skl_pcode_request (dev_priv,SKL_PCODE_CDCLK_CONTROL ,SKL_CDCLK_PREPARE_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,3 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("Failed to inform PCU about cdclk change (%d)\n" , ret);
@@ -975,9 +975,9 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,POSTING_READ (CDCLK_CTL );/* inform PCU of the change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,SKL_PCODE_CDCLK_CONTROL , pcu_ack); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv); }
@@ -1268,10 +1268,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, }/* Inform power controller of upcoming frequency change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ ,0x80000000 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) { DRM_ERROR("PCode CDCLK freq change notify failed (err %d, freq %d)\n",
@@ -1300,10 +1300,10 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, val |=BXT_CDCLK_SSA_PRECHARGE_ENABLE ;I915_WRITE (CDCLK_CTL , val); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ ,DIV_ROUND_UP (cdclk,25000 )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) { DRM_ERROR("PCode CDCLK freq set failed, (err %d, freq %d)\n",
@@ -1518,12 +1518,12 @@ static void cnl_set_cdclk(struct drm_i915_private *dev_priv,u32 val, divider, pcu_ack;int ret; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); ret =skl_pcode_request (dev_priv,SKL_PCODE_CDCLK_CONTROL ,SKL_CDCLK_PREPARE_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,SKL_CDCLK_READY_FOR_CHANGE ,3 ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);if (ret) {DRM_ERROR ("Failed to inform PCU about cdclk change (%d)\n" , ret);
@@ -1575,9 +1575,9 @@ static void cnl_set_cdclk(struct drm_i915_private *dev_priv,I915_WRITE (CDCLK_CTL , val);/* inform PCU of the change */ -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);sandybridge_pcode_write (dev_priv,SKL_PCODE_CDCLK_CONTROL , pcu_ack); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);intel_update_cdclk (dev_priv); }
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -4955,10 +4955,10 @@ void hsw_enable_ips(struct intel_crtc *crtc)assert_plane_enabled (dev_priv, crtc->plane);if (IS_BROADWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);WARN_ON (sandybridge_pcode_write (dev_priv,DISPLAY_IPS_CONTROL ,IPS_ENABLE |IPS_PCODE_CONTROL )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);/* Quoting Art Runyan: "its not safe to expect any particular * value in IPS_CTL bit 31 after enabling IPS through the * mailbox." Moreover, the mailbox may return a bogus state,
@@ -4988,9 +4988,9 @@ void hsw_disable_ips(struct intel_crtc *crtc)assert_plane_enabled (dev_priv, crtc->plane);if (IS_BROADWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);WARN_ON (sandybridge_pcode_write (dev_priv,DISPLAY_IPS_CONTROL ,0 )); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);/* wait for pcode to finish disabling IPS, which may take up to 42ms */ if (intel_wait_for_register(dev_priv, IPS_CTL, IPS_ENABLE, 0,
@@ -8846,11 +8846,11 @@ static uint32_t hsw_read_dcomp(struct drm_i915_private *dev_priv)static void hsw_write_dcomp (struct drm_i915_private *dev_priv,uint32_t val) {if (IS_HASWELL (dev_priv)) { -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);if (sandybridge_pcode_write (dev_priv,GEN6_PCODE_WRITE_D_COMP , val))DRM_DEBUG_KMS ("Failed to write to D_COMP\n" ); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); }else {I915_WRITE (D_COMP_BDW , val);POSTING_READ (D_COMP_BDW );
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1243,7 +1243,7 @@ void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,static inline u32 gen6_sanitize_rps_pm_mask (const struct drm_i915_private *i915,u32 mask) { -return mask & ~i915->rps.pm_intrmsk_mbz; +return mask & ~i915->pm.rps.pm_intrmsk_mbz; }void intel_runtime_pm_disable_interrupts (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_pm.c +188 -175
882 lines not on this page · raw message
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
@@ -785,7 +785,7 @@ static void vlv_set_power_well(struct drm_i915_private *dev_priv, state = enable ?PUNIT_PWRGT_PWR_ON (power_well_id) :PUNIT_PWRGT_PWR_GATE (power_well_id); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);#define COND \ ((vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) & mask) == state)
@@ -806,7 +806,7 @@ static void vlv_set_power_well(struct drm_i915_private *dev_priv,#undef COND out: -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); } static void vlv_power_well_enable(struct drm_i915_private *dev_priv,
@@ -833,7 +833,7 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv, mask =PUNIT_PWRGT_MASK (power_well_id); ctrl =PUNIT_PWRGT_PWR_ON (power_well_id); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); state =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ) & mask;/*
@@ -852,7 +852,7 @@ static bool vlv_power_well_enabled(struct drm_i915_private *dev_priv, ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ) & mask;WARN_ON (ctrl != state); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return enabled; }
@@ -1364,7 +1364,7 @@ static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv,bool enabled;u32 state, ctrl; -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock); state =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ) &DP_SSS_MASK (pipe);/*
@@ -1381,7 +1381,7 @@ static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv, ctrl =vlv_punit_read (dev_priv,PUNIT_REG_DSPFREQ ) &DP_SSC_MASK (pipe);WARN_ON (ctrl <<16 != state); -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock);return enabled; }
@@ -1396,7 +1396,7 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv, state = enable ?DP_SSS_PWR_ON (pipe) :DP_SSS_PWR_GATE (pipe); -mutex_lock (&dev_priv->rps.hw_lock); +mutex_lock (&dev_priv->pm.pcu_lock);#define COND \ ((vlv_punit_read(dev_priv, PUNIT_REG_DSPFREQ) & DP_SSS_MASK(pipe)) == state)
@@ -1417,7 +1417,7 @@ static void chv_set_pipe_power_well(struct drm_i915_private *dev_priv,#undef COND out: -mutex_unlock (&dev_priv->rps.hw_lock); +mutex_unlock (&dev_priv->pm.pcu_lock); } static void chv_pipe_power_well_enable(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_sideband.c +3 -3
@@ -81,7 +81,7 @@ u32 vlv_punit_read(struct drm_i915_private *dev_priv, u32 addr) {u32 val =0 ; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_PUNIT,
@@ -95,7 +95,7 @@ int vlv_punit_write(struct drm_i915_private *dev_priv, u32 addr, u32 val) {int err; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); err = vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_PUNIT,
@@ -125,7 +125,7 @@ u32 vlv_nc_read(struct drm_i915_private *dev_priv, u8 addr) {u32 val =0 ; -WARN_ON (!mutex_is_locked (&dev_priv->rps.hw_lock)); +WARN_ON (!mutex_is_locked (&dev_priv->pm.pcu_lock));mutex_lock (&dev_priv->sb_lock); vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_NC,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/10] drm/i915: Name structure in dev_priv that contains RPS/RC6 state as "pm"
Quoting Sagar Arun Kamble (2017-10-04 15:07:21)
Quoted 11 lines
Prepared substructure rps for RPS related state.
autoenable_workandpcu_lockare used for RC6 hence they are defined outside rps structure. Renamed the RPS lock aspcu_lock.v2: Rebase.
Signed-off-by Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>
Whole hearted agreement.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
In reply to Sagar Arun KambleThis function gives the status of RC6, whether disabled or if enabled then which state. intel_enable_rc6 will be used for enabling RC6 in the next patch.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ drivers/gpu/drm/i915/intel_uc.c | 3 ++- 5 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2481,7 +2481,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_enable_rc6 ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_sysfs.c +1 -1
@@ -49,7 +49,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv,static ssize_t show_rc6_mask (struct device *kdev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_enable_rc6 ()); +return snprintf (buf,PAGE_SIZE ,"%x\n" ,intel_rc6_enabled ()); } static ssize_t
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1902,7 +1902,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc, struct intel_crtc_state *cstate);void intel_init_ipc (struct drm_i915_private *dev_priv);void intel_enable_ipc (struct drm_i915_private *dev_priv); -static inline int intel_enable_rc6 (void ) +static inline int intel_rc6_enabled (void ) {return i915_modparams.enable_rc6; }
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -6606,7 +6606,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN9_RENDER_PG_IDLE_HYSTERESIS ,25 );/* 3a: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;DRM_INFO ("RC6 %s\n" ,onoff (rc6_mask &GEN6_RC_CTL_RC6_ENABLE ));I915_WRITE (GEN6_RC6_THRESHOLD ,37500 );/* 37.5/125ms per EI */
@@ -6655,7 +6655,7 @@ static void gen8_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6_THRESHOLD ,50000 );/* 50/125ms per EI */ /* 3: Enable RC6 */ -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mask =GEN6_RC_CTL_RC6_ENABLE ;intel_print_rc6_info (dev_priv, rc6_mask); I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
@@ -6747,7 +6747,7 @@ static void gen6_enable_rc6(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RC6pp_THRESHOLD,64000 );/* unused */ /* Check if we are enabling RC6 */ - rc6_mode =intel_enable_rc6 (); + rc6_mode =intel_rc6_enabled ();if (rc6_mode &INTEL_RC6_ENABLE ) rc6_mask |=GEN6_RC_CTL_RC6_ENABLE ;
@@ -7249,7 +7249,7 @@ static void cherryview_enable_rc6(struct drm_i915_private *dev_priv) pcbr =I915_READ (VLV_PCBR );/* 3: Enable RC6 */ -if ((intel_enable_rc6 () &INTEL_RC6_ENABLE ) && +if ((intel_rc6_enabled () &INTEL_RC6_ENABLE ) && (pcbr >>VLV_PCBR_ADDR_SHIFT )) rc6_mode =GEN7_RC_CTL_TO_MODE ;
@@ -7342,7 +7342,7 @@ static void valleyview_enable_rc6(struct drm_i915_private *dev_priv)VLV_MEDIA_RC6_COUNT_EN | VLV_RENDER_RC6_COUNT_EN)); -if (intel_enable_rc6 () &INTEL_RC6_ENABLE ) +if (intel_rc6_enabled () &INTEL_RC6_ENABLE ) rc6_mode =GEN7_RC_CTL_TO_MODE |VLV_RC_CTL_CTX_RST_PARALLEL ;intel_print_rc6_info (dev_priv, rc6_mode);
@@ -9414,7 +9414,7 @@ u64 intel_rc6_residency_us(struct drm_i915_private *dev_priv, {u64 time_hw, units, div; -if (!intel_enable_rc6 ()) +if (!intel_rc6_enabled ())return 0 ;intel_runtime_pm_get (dev_priv);
drivers/gpu/drm/i915/intel_uc.c +2 -1
@@ -551,7 +551,8 @@ int intel_guc_sample_forcewake(struct intel_guc *guc) action[0 ] =INTEL_GUC_ACTION_SAMPLE_FORCEWAKE ;/* WaRsDisableCoarsePowerGating:skl,bxt */ -if (!intel_enable_rc6 () ||NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) +if (!intel_rc6_enabled () || +NEEDS_WaRsDisableCoarsePowerGating (dev_priv)) action[1 ] =0 ;else /* bit 0 and 1 are for Render and Media domain separately */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/10] drm/i915: Rename intel_enable_rc6 to intel_rc6_enabled
Quoting Sagar Arun Kamble (2017-10-04 15:07:22)
Quoted 10 lines
This function gives the status of RC6, whether disabled or if enabled then which state.
intel_enable_rc6will be used for enabling RC6 in the next patch.Signed-off-by Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Radoslaw Szwichtenberg <[email protected]>Reviewed-by Ewelina Musial <[email protected]>
Reminds me that I want to kill i915.enable_rc6 modparam. Well, hopefully by the end of this we can disable rc6 without disabling powersaving in general -- so people will stop conflating the two in bug reports!
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915: Create generic function to setup ring frequency table
In reply to Sagar Arun KamblePrepared intel_update_ring_freq function to setup ring frequency for applicable platforms determined by macro - NEEDS_RING_FREQ_UPDATE
--- drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +15 -4
@@ -7868,6 +7868,19 @@ static void intel_init_emon(struct drm_i915_private *dev_priv) dev_priv->ips.corr = (lcfuse &LCFUSE_HIV_MASK ); } +#define NEEDS_RING_FREQ_UPDATE (i915) \ + (((INTEL_GEN(i915) >= 9) && \ + (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915))) || \ + (IS_BROADWELL(i915)) || \ + ((INTEL_GEN(i915) >= 6) && \ + (!IS_CHERRYVIEW(i915) && !IS_VALLEYVIEW(i915)))) + +static inline void intel_update_ring_freq (struct drm_i915_private *i915) +{ +if (NEEDS_RING_FREQ_UPDATE (i915)) +gen6_update_ring_freq (i915); +} +void intel_init_gt_powersave (struct drm_i915_private *dev_priv) {struct intel_rps *rps = &dev_priv->pm.rps;
@@ -8014,21 +8027,19 @@ void intel_enable_gt_powersave(struct drm_i915_private *dev_priv) }else if (INTEL_GEN (dev_priv) >=9 ) {gen9_enable_rc6 (dev_priv);gen9_enable_rps (dev_priv); -if (IS_GEN9_BC (dev_priv) ||IS_CANNONLAKE (dev_priv)) -gen6_update_ring_freq (dev_priv); }else if (IS_BROADWELL (dev_priv)) {gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv); -gen6_update_ring_freq (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) {gen6_enable_rc6 (dev_priv);gen6_enable_rps (dev_priv); -gen6_update_ring_freq (dev_priv); }else if (IS_IRONLAKE_M (dev_priv)) {ironlake_enable_drps (dev_priv);intel_init_emon (dev_priv); } +intel_update_ring_freq (dev_priv); +WARN_ON (dev_priv->pm.rps.max_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.idle_freq > dev_priv->pm.rps.max_freq);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: Create generic function to setup ring frequency table
Quoting Sagar Arun Kamble (2017-10-04 15:07:23)
Quoted 17 lines
Prepared
intel_update_ring_freqfunction to setup ring frequency for applicable platforms determined by macro -NEEDS_RING_FREQ_UPDATESigned-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void intel_init_emon(struct drm_i915_private *dev_priv) · line 7876
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +6
-0@@ -7868,6 +7868,19 @@ static void intel_init_emon(struct drm_i915_private *dev_priv) dev_priv->ips.corr = (lcfuse &LCFUSE_HIV_MASK ); } +#define NEEDS_RING_FREQ_UPDATE (i915) \ + (((INTEL_GEN(i915) >= 9) && \ + (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915))) || \ + (IS_BROADWELL(i915)) || \ + ((INTEL_GEN(i915) >= 6) && \ + (!IS_CHERRYVIEW(i915) && !IS_VALLEYVIEW(i915))))
Let's not contort ourselves into using a macro where gcc will compile a function just as tightly.
Compare modifying a more verbose function than this macro for the next BC/LP.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: Create generic function to setup ring frequency table
Quoted 30 lines · Chris Wilson
Quoting Sagar Arun Kamble (2017-10-04 15:07:23)
Quoted 17 lines
Prepared
intel_update_ring_freqfunction to setup ring frequency for applicable platforms determined by macro -NEEDS_RING_FREQ_UPDATESigned-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void intel_init_emon(struct drm_i915_private *dev_priv) · line 7876
Quoted 9 lines
drivers/gpu/drm/i915/intel_pm.c +6
-0@@ -7868,6 +7868,19 @@ static void intel_init_emon(struct drm_i915_private *dev_priv) dev_priv->ips.corr = (lcfuse &LCFUSE_HIV_MASK ); } +#define NEEDS_RING_FREQ_UPDATE (i915) \ + (((INTEL_GEN(i915) >= 9) && \ + (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915))) || \ + (IS_BROADWELL(i915)) || \ + ((INTEL_GEN(i915) >= 6) && \ + (!IS_CHERRYVIEW(i915) && !IS_VALLEYVIEW(i915))))Let's not contort ourselves into using a macro where gcc will compile a function just as tightly.
Quoted 3 lines
Compare modifying a more verbose function than this macro for the next BC/LP.
-Chris
Yes. Function will be easier. Will make this an inline function.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: Create generic functions to control RC6, RPS
In reply to Sagar Arun KamblePrepared generic functions intel_enable_rc6, intel_disable_rc6, intel_enable_rps and intel_disable_rps functions to setup RC6/RPS based on platforms.
--- drivers/gpu/drm/i915/intel_pm.c | 95 ++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +61 -34
@@ -7977,74 +7977,101 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)gen6_reset_rps_interrupts (dev_priv); } -void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_rc6 (struct drm_i915_private *dev_priv) { -if (!READ_ONCE (dev_priv->pm.rps.enabled)) -return ; - -mutex_lock (&dev_priv->pm.pcu_lock); - -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=9 )gen9_disable_rc6 (dev_priv); -gen9_disable_rps (dev_priv); - }else if (IS_CHERRYVIEW (dev_priv)) { +else if (IS_CHERRYVIEW (dev_priv))cherryview_disable_rc6 (dev_priv); -cherryview_disable_rps (dev_priv); - }else if (IS_VALLEYVIEW (dev_priv)) { +else if (IS_VALLEYVIEW (dev_priv))valleyview_disable_rc6 (dev_priv); -valleyview_disable_rps (dev_priv); - }else if (INTEL_GEN (dev_priv) >=6 ) { +else if (INTEL_GEN (dev_priv) >=6 )gen6_disable_rc6 (dev_priv); +} + +void intel_disable_rps (struct drm_i915_private *dev_priv) +{ +if (INTEL_GEN (dev_priv) >=9 ) +gen9_disable_rps (dev_priv); +else if (IS_CHERRYVIEW (dev_priv)) +cherryview_disable_rps (dev_priv); +else if (IS_VALLEYVIEW (dev_priv)) +valleyview_disable_rps (dev_priv); +else if (INTEL_GEN (dev_priv) >=6 )gen6_disable_rps (dev_priv); - }else if (IS_IRONLAKE_M (dev_priv)) { +else if (IS_IRONLAKE_M (dev_priv))ironlake_disable_drps (dev_priv); - } - - dev_priv->pm.rps.enabled = false; -mutex_unlock (&dev_priv->pm.pcu_lock); } -void intel_enable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) { -/* We shouldn't be disabling as we submit, so this should be less -* racy than it appears! -*/ -if (READ_ONCE (dev_priv->pm.rps.enabled)) -return ; - -/* Powersaving is controlled by the host when inside a VM */ -if (intel_vgpu_active (dev_priv)) +if (!READ_ONCE (dev_priv->pm.rps.enabled))return ;mutex_lock (&dev_priv->pm.pcu_lock); -if (IS_CHERRYVIEW (dev_priv)) { +intel_disable_rc6 (dev_priv); +intel_disable_rps (dev_priv); + + dev_priv->pm.rps.enabled = false; +mutex_unlock (&dev_priv->pm.pcu_lock); +} + +void intel_enable_rc6 (struct drm_i915_private *dev_priv) +{ +if (IS_CHERRYVIEW (dev_priv))cherryview_enable_rc6 (dev_priv); +else if (IS_VALLEYVIEW (dev_priv)) +valleyview_enable_rc6 (dev_priv); +else if (INTEL_GEN (dev_priv) >=9 ) +gen9_enable_rc6 (dev_priv); +else if (IS_BROADWELL (dev_priv)) +gen8_enable_rc6 (dev_priv); +else if (INTEL_GEN (dev_priv) >=6 ) +gen6_enable_rc6 (dev_priv); +} + +void intel_enable_rps (struct drm_i915_private *dev_priv) +{ +if (IS_CHERRYVIEW (dev_priv)) {cherryview_enable_rps (dev_priv); }else if (IS_VALLEYVIEW (dev_priv)) { -valleyview_enable_rc6 (dev_priv);valleyview_enable_rps (dev_priv); }else if (INTEL_GEN (dev_priv) >=9 ) { -gen9_enable_rc6 (dev_priv);gen9_enable_rps (dev_priv); }else if (IS_BROADWELL (dev_priv)) { -gen8_enable_rc6 (dev_priv);gen8_enable_rps (dev_priv); }else if (INTEL_GEN (dev_priv) >=6 ) { -gen6_enable_rc6 (dev_priv);gen6_enable_rps (dev_priv); }else if (IS_IRONLAKE_M (dev_priv)) {ironlake_enable_drps (dev_priv);intel_init_emon (dev_priv); } -intel_update_ring_freq (dev_priv); -WARN_ON (dev_priv->pm.rps.max_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.idle_freq > dev_priv->pm.rps.max_freq);WARN_ON (dev_priv->pm.rps.efficient_freq < dev_priv->pm.rps.min_freq);WARN_ON (dev_priv->pm.rps.efficient_freq > dev_priv->pm.rps.max_freq); +} + +void intel_enable_gt_powersave (struct drm_i915_private *dev_priv) +{ +/* We shouldn't be disabling as we submit, so this should be less +* racy than it appears! +*/ +if (READ_ONCE (dev_priv->pm.rps.enabled)) +return ; + +/* Powersaving is controlled by the host when inside a VM */ +if (intel_vgpu_active (dev_priv)) +return ; + +mutex_lock (&dev_priv->pm.pcu_lock); + +intel_enable_rc6 (dev_priv); +intel_enable_rps (dev_priv); +intel_update_ring_freq (dev_priv); dev_priv->pm.rps.enabled = true;mutex_unlock (&dev_priv->pm.pcu_lock);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/10] drm/i915: Create generic functions to control RC6, RPS
Quoting Sagar Arun Kamble (2017-10-04 15:07:24)
Quoted 18 lines
Prepared generic functions
intel_enable_rc6,intel_disable_rc6,intel_enable_rpsandintel_disable_rpsfunctions to setup RC6/RPS based on platforms.Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 95 ++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) · line 7980
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -7977,74 +7977,101 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)gen6_reset_rps_interrupts (dev_priv); } -void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_rc6 (struct drm_i915_private *dev_priv)
Hmm, don't export these yet, as we need to define how to do the locking.
We normally would do
static void __intel_disable_rc6() {
/* do stuff */
}void intel_disable_rc6() {
mutex_lock(i915->pm.pcu_lock);
__intel_disable_rc6();
mutex_unlock(i915->pm.pcu_lock);
}Furthermore, we want to decide if we want these to track enabled state and skip if already the desired state.
Otherwise \o/
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/10] drm/i915: Create generic functions to control RC6, RPS
Thanks for the reviews. Will be sending the updated revision.
Thanks
Sagar
Quoted 38 lines · Chris Wilson
Quoting Sagar Arun Kamble (2017-10-04 15:07:24)
Quoted 18 lines
Prepared generic functions
intel_enable_rc6,intel_disable_rc6,intel_enable_rpsandintel_disable_rpsfunctions to setup RC6/RPS based on platforms.Signed-off-by Sagar Arun Kamble <[email protected]>Cc Imre Deak <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Radoslaw Szwichtenberg <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 95 ++++++++++++++++++++++++++--------------- 1 file changed, 61 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv) · line 7980
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -7977,74 +7977,101 @@ void intel_sanitize_gt_powersave(struct drm_i915_private *dev_priv)gen6_reset_rps_interrupts (dev_priv); } -void intel_disable_gt_powersave (struct drm_i915_private *dev_priv) +void intel_disable_rc6 (struct drm_i915_private *dev_priv)Hmm, don't export these yet, as we need to define how to do the locking.
We normally would do
static void __intel_disable_rc6() { /* do stuff */ }void intel_disable_rc6() { mutex_lock(i915->pm.pcu_lock); __intel_disable_rc6(); mutex_unlock(i915->pm.pcu_lock); }
Quoted 5 lines
Furthermore, we want to decide if we want these to track enabled state and skip if already the desired state.
Otherwise \o/
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: Introduce separate status variable for RC6 and Ring frequency setup
In reply to Sagar Arun KambleDefined new struct intel_rc6 to hold RC6 specific state and intel_ring_pstate to hold ring specific state.
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 10 +++++++ drivers/gpu/drm/i915/intel_pm.c | 58 ++++++++++++++++++++++++++++++----------- 3 files changed, 54 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2481,7 +2481,7 @@ static int intel_runtime_suspend(struct device *kdev)struct drm_i915_private *dev_priv =to_i915 (dev);int ret; -if (WARN_ON_ONCE (!(dev_priv->pm.rps.enabled &&intel_rc6_enabled ()))) +if (WARN_ON_ONCE (!(dev_priv->pm.rc6.enabled &&intel_rc6_enabled ())))return -ENODEV ;if (WARN_ON_ONCE (!HAS_RUNTIME_PM (dev_priv)))
drivers/gpu/drm/i915/i915_drv.h +10 -0
@@ -1359,8 +1359,18 @@ struct intel_rps {struct intel_rps_ei ei; }; +struct intel_rc6 { +bool enabled; +}; + +struct intel_ring_pstate { +bool configured; +}; +struct intel_gen6_power_mgmt {struct intel_rps rps; +struct intel_rc6 rc6; +struct intel_ring_pstate ring_pstate;struct delayed_work autoenable_work;/*
drivers/gpu/drm/i915/intel_pm.c +43 -15
145 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: Introduce separate status variable for RC6 and Ring frequency setup
Quoting Sagar Arun Kamble (2017-10-04 15:07:25)
Quoted 2 lines
Defined new struct
intel_rc6to hold RC6 specific state andintel_ring_pstateto hold ring specific state.
What do you mean by ring? Probably not struct intel_ring.
For us it would be closer to intel_engine_cs_pstate, which is a bit unwieldy but a better starting point.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: Introduce separate status variable for RC6 and Ring frequency setup
Quoted 8 lines · Chris Wilson
Quoting Sagar Arun Kamble (2017-10-04 15:07:25)
Quoted 2 lines
Defined new struct
intel_rc6to hold RC6 specific state andintel_ring_pstateto hold ring specific state.What do you mean by ring? Probably not struct
intel_ring.For us it would be closer to
intel_engine_cs_pstate, which is a bit unwieldy but a better starting point.
-Chris
Yes. This naming is little confusing.
This is L3/LLC and interface between IA and DDR.
how about intel_llc_pstate?
Saw a patch https://patchwork.freedesktop.org/patch/105768/ that actually indicates HAS_LLC is equivalent to the macro I had prepared earlier NEEDS_RING_FREQ_UPDATE. So will use HAS_LLC in these new functions for ring setup.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Separate RC6, RPS, Ring Frequency management
In reply to Sagar Arun Kamble== Series Details ==
== Series Details ==
Series: drm/i915: Separate RC6, RPS, Ring Frequency management
URL : https://patchwork.freedesktop.org/series/31387/
State : success
== Summary ==
Series 31387v1 drm/i915: Separate RC6, RPS, Ring Frequency management
https://patchwork.freedesktop.org/api/1.0/series/31387/revisions/1/mbox/
Test drv_module_reload:
Subgroup basic-reload-inject:
dmesg-warn -> PASS (fi-cfl-s) k.org#196765k.org#196765 https://bugzilla.kernel.org/show_bug.cgi?id=196765
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:478s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:391s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:562s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:525s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:534s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:546s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:532s fi-cfl-s total:289 pass:256 dwarn:1 dfail:0 fail:0 skip:32 time:559s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:621s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:439s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:596s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:443s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:420s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:467s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:512s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:475s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:505s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:574s fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:492s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:658s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:479s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:616s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:530s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:588s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:478s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:583s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:432s
f7f890956c4796b5b6993c33b378d45beeca6a05 drm-tip: 2017y-10m-04d-14h-20m-47s UTC integration manifest b869eabf0625 drm/i915: Introduce separate status variable for RC6 and Ring frequency setup 1b7109d8baeb drm/i915: Create generic functions to control RC6, RPSf23ac0c469e9 drm/i915: Create generic function to setup ring frequency table 70b31be76c70 drm/i915: Rename intel_enable_rc6 to intel_rc6_enableda3e11168a1ae drm/i915: Name structure in dev_priv that contains RPS/RC6 state as "pm" b7ddb1f78c2d drm/i915: Name i915_runtime_pm structure in dev_priv as "rpm" 2198cb85a974 drm/i915: Separate RPS and RC6 handling for CHV009eb08673c9 drm/i915: Separate RPS and RC6 handling for VLV775eba558b1f drm/i915: Separate RPS and RC6 handling for BDW42f8c917daba drm/i915: Separate RPS and RC6 handling for gen6+
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5896/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Sagar Arun Kamble (2017-10-04 15:07:15)
Quoted 23 lines
With GuC based SLPC, frequency control will be moved to GuC and Host will continue to control RC6 and Ring frequency setup. This needs separate handling of RPS, RC6 and ring frequencies in i915 flows. We still continue use the
*gt_powersaveroutines with separate status variables for RPS, RC6, ring frequency as pm.rps.enabled, pm.rc6.enabled and pm.ring_pstate.configured respectively indev_priv.
Post this, with SLPC changes integrated we can just skip the Host RPS path in i915 PM flows.Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Cc Radoslaw Szwichtenberg <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Beuchat, Marc <[email protected]>Sagar Arun Kamble (10):
drm/i915: Separate RPS and RC6 handling for gen6+ drm/i915: Separate RPS and RC6 handling for BDW drm/i915: Separate RPS and RC6 handling for VLV drm/i915: Separate RPS and RC6 handling for CHV drm/i915: Namei915_runtime_pmstructure indev_privas "rpm" drm/i915: Name structure indev_privthat contains RPS/RC6 state as
Quoted 6 lines
"pm"drm/i915: Rename
intel_enable_rc6tointel_rc6_enableddrm/i915: Create generic function to setup ring frequency table drm/i915: Create generic functions to control RC6, RPS drm/i915: Introduce separate status variable for RC6 and Ring
frequency setup
This series is looking really good. An important first step in separating rps from rc6.
-Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Separate RC6, RPS, Ring Frequency management
In reply to Sagar Arun Kamble== Series Details ==
== Series Details ==
Series: drm/i915: Separate RC6, RPS, Ring Frequency management
URL : https://patchwork.freedesktop.org/series/31387/
State : success
== Summary ==
Test gem_flink_race:
Subgroup flink_close:
fail -> PASS (shard-hsw) fdo#102655fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655
shard-hsw total:2430 pass:1332 dwarn:7 dfail:0 fail:7 skip:1084 time:10167s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5896/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx