All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Add RPS debugfs disabling for gen6+ platforms
@ 2016-02-18  9:26 ankitprasad.r.sharma
  2016-02-18 10:31 ` Kamble, Sagar A
  2016-02-19 14:52 ` ✗ Fi.CI.BAT: failure for " Patchwork
  0 siblings, 2 replies; 3+ messages in thread
From: ankitprasad.r.sharma @ 2016-02-18  9:26 UTC (permalink / raw)
  To: intel-gfx; +Cc: Deepak S, Ankitprasad Sharma, Praveen Paneri

From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>

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 <deepak.s@intel.com>
Signed-off-by: Praveen Paneri <praveen.paneri@intel.com>
Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h     |  2 ++
 2 files changed, 57 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index aa7c7a3..1f58540 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -5023,6 +5023,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(INTEL_INFO(dev)->gen < 6)
+		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;
+
+	flush_delayed_work(&dev_priv->rps.delayed_resume_work);
+
+	if(INTEL_INFO(dev)->gen < 6)
+		return -ENODEV;
+
+	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_AVG);
+
+	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)
 {
@@ -5391,6 +5445,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},
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9d67097..28e3537 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1169,6 +1169,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;
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Add RPS debugfs disabling for gen6+ platforms
  2016-02-18  9:26 [PATCH] drm/i915: Add RPS debugfs disabling for gen6+ platforms ankitprasad.r.sharma
@ 2016-02-18 10:31 ` Kamble, Sagar A
  2016-02-19 14:52 ` ✗ Fi.CI.BAT: failure for " Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: Kamble, Sagar A @ 2016-02-18 10:31 UTC (permalink / raw)
  To: ankitprasad.r.sharma, intel-gfx; +Cc: Deepak S, Praveen Paneri

Get/Put RPM ref around RP_CONTROL write and outside mutex lock.

On 2/18/2016 2:56 PM, ankitprasad.r.sharma@intel.com wrote:
> From: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
>
> 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 <deepak.s@intel.com>
> Signed-off-by: Praveen Paneri <praveen.paneri@intel.com>
> Signed-off-by: Ankitprasad Sharma <ankitprasad.r.sharma@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_debugfs.c | 55 +++++++++++++++++++++++++++++++++++++
>   drivers/gpu/drm/i915/i915_drv.h     |  2 ++
>   2 files changed, 57 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index aa7c7a3..1f58540 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -5023,6 +5023,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(INTEL_INFO(dev)->gen < 6)
> +		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;
> +
> +	flush_delayed_work(&dev_priv->rps.delayed_resume_work);
> +
> +	if(INTEL_INFO(dev)->gen < 6)
> +		return -ENODEV;
> +
> +	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_AVG);
> +
> +	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)
>   {
> @@ -5391,6 +5445,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},
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 9d67097..28e3537 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1169,6 +1169,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;
>   

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Add RPS debugfs disabling for gen6+ platforms
  2016-02-18  9:26 [PATCH] drm/i915: Add RPS debugfs disabling for gen6+ platforms ankitprasad.r.sharma
  2016-02-18 10:31 ` Kamble, Sagar A
@ 2016-02-19 14:52 ` Patchwork
  1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2016-02-19 14:52 UTC (permalink / raw)
  To: ankitprasad.r.sharma; +Cc: intel-gfx

== Summary ==

Series 3572v1 drm/i915: Add RPS debugfs disabling for gen6+ platforms
http://patchwork.freedesktop.org/api/1.0/series/3572/revisions/1/mbox/

Test drv_module_reload_basic:
                pass       -> DMESG-WARN (ilk-hp8440p)
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                pass       -> INCOMPLETE (snb-x220t)
                dmesg-warn -> INCOMPLETE (ilk-hp8440p) UNSTABLE
        Subgroup basic-flip-vs-wf_vblank:
                fail       -> PASS       (snb-x220t)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                fail       -> DMESG-FAIL (snb-x220t)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                fail       -> PASS       (bdw-ultra)
                pass       -> DMESG-WARN (byt-nuc)
        Subgroup basic-rte:
                dmesg-warn -> PASS       (byt-nuc) UNSTABLE

bdw-nuci7        total:164  pass:153  dwarn:0   dfail:0   fail:0   skip:11 
bdw-ultra        total:167  pass:153  dwarn:0   dfail:0   fail:0   skip:14 
bsw-nuc-2        total:167  pass:135  dwarn:2   dfail:0   fail:0   skip:30 
byt-nuc          total:167  pass:141  dwarn:1   dfail:0   fail:0   skip:25 
hsw-gt2          total:167  pass:156  dwarn:0   dfail:1   fail:0   skip:10 
ilk-hp8440p      total:61   pass:39   dwarn:1   dfail:0   fail:0   skip:20 
ivb-t430s        total:167  pass:152  dwarn:0   dfail:0   fail:1   skip:14 
skl-i5k-2        total:167  pass:150  dwarn:1   dfail:0   fail:0   skip:16 
snb-dellxps      total:167  pass:144  dwarn:0   dfail:0   fail:1   skip:22 
snb-x220t        total:132  pass:112  dwarn:0   dfail:1   fail:1   skip:17 

Results at /archive/results/CI_IGT_test/Patchwork_1432/

094be102b10f6acd9b670b327e2363d49c09a65c drm-intel-nightly: 2016y-02m-18d-09h-43m-08s UTC integration manifest
99fad91ce820010a5832ce1b24360e479c951411 drm/i915: Add RPS debugfs disabling for gen6+ platforms

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-19 14:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-18  9:26 [PATCH] drm/i915: Add RPS debugfs disabling for gen6+ platforms ankitprasad.r.sharma
2016-02-18 10:31 ` Kamble, Sagar A
2016-02-19 14:52 ` ✗ Fi.CI.BAT: failure for " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.