drm/i915/vlv: Add RPS debugfs disabling for vlv/chv
Subsystems (2)
PATCH 1/1 drm/i915/vlv: Add RPS debugfs disabling for vlv/chv
This patch exposes a new debugfs interface 'i915_rps_disable' Following 2 values shall be echoed into this file. '0' - RPS explicitly enabled .
'1' - RPS explicitly disabled.
This interface provides capabilty to enable/disable Turbo feature at runtime, which is needed for its validation.
--- drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ 2 files changed, 57 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +55 -0
@@ -4771,6 +4771,60 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops, i915_min_freq_get, i915_min_freq_set, "%llu\n"); +static int i915_rps_disable_get (void *data,u64 *val) +{ +struct drm_device *dev = data; +struct drm_i915_private *dev_priv = dev->dev_private; + +if (!IS_VALLEYVIEW (dev)) +return -ENODEV ; + +flush_delayed_work (&dev_priv->rps.delayed_resume_work); + + *val = dev_priv->rps.rps_disable; + +return 0 ; +} + +static int i915_rps_disable_set (void *data,u64 val) +{ +struct drm_device *dev = data; +struct drm_i915_private *dev_priv = dev->dev_private; +int ret; + +if (!IS_VALLEYVIEW (dev)) +return -ENODEV ; + +flush_delayed_work (&dev_priv->rps.delayed_resume_work); + +DRM_DEBUG_DRIVER ("Setting RPS disable %s\n" , + val ?"true" :"false" ); + + ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); +if (ret) +return ret; + + dev_priv->rps.rps_disable = val; + +if (val) +I915_WRITE (GEN6_RP_CONTROL ,0 ); +else +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 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (i915_rps_disable_fops, + i915_rps_disable_get, i915_rps_disable_set, +"%llu\n" ); +static int i915_cache_sharing_get (void *data,u64 *val) {
@@ -5107,6 +5161,7 @@ static const struct i915_debugfs_files { {"i915_wedged", &i915_wedged_fops}, {"i915_max_freq", &i915_max_freq_fops}, {"i915_min_freq", &i915_min_freq_fops}, + {"i915_rps_disable", &i915_rps_disable_fops}, {"i915_cache_sharing", &i915_cache_sharing_fops}, {"i915_ring_stop", &i915_ring_stop_fops}, {"i915_ring_missed_irq", &i915_ring_missed_irq_fops},
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1137,6 +1137,8 @@ struct intel_gen6_power_mgmt {u8 up_threshold;/* Current %busy required to uplock */ u8 down_threshold;/* Current %busy required to downclock */ +bool rps_disable; +int last_adj;enum {LOW_POWER ,BETWEEN ,HIGH_POWER } power;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Praveen Paneri
This patch exposes a new debugfs interface '
i915_rps_disable' Following 2 values shall be echoed into this file. '0' - RPS explicitly enabled .
'1' - RPS explicitly disabled.This interface provides capabilty to enable/disable Turbo feature at runtime, which is needed for its validation.
Signed-off-by Deepak S <[email protected]>Signed-off-by Praveen Paneri <[email protected]>
If you need this for validation I want to see that validation test commit to igt.
Thanks, Daniel
Quoted 98 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 2 ++ 2 files changed, 57 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +55
-0@@ -4771,6 +4771,60 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_min_freq_fops, i915_min_freq_get, i915_min_freq_set, "%llu\n"); +static int i915_rps_disable_get (void *data,u64 *val) +{ +struct drm_device *dev = data; +struct drm_i915_private *dev_priv = dev->dev_private; + +if (!IS_VALLEYVIEW (dev)) +return -ENODEV ; + +flush_delayed_work (&dev_priv->rps.delayed_resume_work); + + *val = dev_priv->rps.rps_disable; + +return 0 ; +} + +static int i915_rps_disable_set (void *data,u64 val) +{ +struct drm_device *dev = data; +struct drm_i915_private *dev_priv = dev->dev_private; +int ret; + +if (!IS_VALLEYVIEW (dev)) +return -ENODEV ; + +flush_delayed_work (&dev_priv->rps.delayed_resume_work); + +DRM_DEBUG_DRIVER ("Setting RPS disable %s\n" , + val ?"true" :"false" ); + + ret =mutex_lock_interruptible (&dev_priv->rps.hw_lock); +if (ret) +return ret; + + dev_priv->rps.rps_disable = val; + +if (val) +I915_WRITE (GEN6_RP_CONTROL ,0 ); +else +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 ); + +mutex_unlock (&dev_priv->rps.hw_lock); + +return 0 ; +} + +DEFINE_SIMPLE_ATTRIBUTE (i915_rps_disable_fops, + i915_rps_disable_get, i915_rps_disable_set, +"%llu\n" ); +static int i915_cache_sharing_get (void *data,u64 *val) {@@ -5107,6 +5161,7 @@ static const struct i915_debugfs_files { {"i915_wedged", &i915_wedged_fops}, {"i915_max_freq", &i915_max_freq_fops}, {"i915_min_freq", &i915_min_freq_fops}, + {"i915_rps_disable", &i915_rps_disable_fops}, {"i915_cache_sharing", &i915_cache_sharing_fops}, {"i915_ring_stop", &i915_ring_stop_fops}, {"i915_ring_missed_irq", &i915_ring_missed_irq_fops},drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -1137,6 +1137,8 @@ struct intel_gen6_power_mgmt {u8 up_threshold;/* Current %busy required to uplock */ u8 down_threshold;/* Current %busy required to downclock */ +bool rps_disable; +int last_adj;enum {LOW_POWER ,BETWEEN ,HIGH_POWER } power;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6923 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -2 302/302 300/302
SNB 315/315 315/315 IVB 336/336 336/336
BYT -1 283/283 282/283
HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@flip-vs-dpms-interruptible PASS(1) DMESG_WARN(1) *ILK igt@kms_flip@wf_vblank-vs-modeset-interruptible PASS(1) DMESG_WARN(1) *BYT igt@gem_tiled_partial_pwrite_pread@reads PASS(1) FAIL(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx