* [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview
@ 2017-02-10 15:03 Chris Wilson
2017-02-10 15:03 ` [PATCH 2/3] drm/i915: Don't accidentally increase the frequency in handling DOWN rps Chris Wilson
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Chris Wilson @ 2017-02-10 15:03 UTC (permalink / raw)
To: intel-gfx
When the RPS tuning was applied to Baytrail, in commit 8fb55197e64d
("drm/i915: Agressive downclocking on Baytrail"), concern was given that
it might cause Cherryview excess wakeups of the common power well.
However, the static thresholds perform poorly for Kodi, and the GPU is
unable to deliver the video frames on time. Enabling the dynamic, finer
thresholds used on all other platforms (including Skylake and Broxton
that also have the same multiple powerwell concerns) allows the GPU to
pick a more appropriate frequency and not drop frames.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_pm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 4348dfad6400..2bf47f15eebe 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4971,8 +4971,7 @@ static int valleyview_set_rps(struct drm_i915_private *dev_priv, u8 val)
if (err)
return err;
- if (!IS_CHERRYVIEW(dev_priv))
- gen6_set_rps_thresholds(dev_priv, val);
+ gen6_set_rps_thresholds(dev_priv, val);
}
dev_priv->rps.cur_freq = val;
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/3] drm/i915: Don't accidentally increase the frequency in handling DOWN rps
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
@ 2017-02-10 15:03 ` Chris Wilson
2017-02-14 15:25 ` Szwichtenberg, Radoslaw
2017-02-10 15:03 ` [PATCH 3/3] drm/i915: Only apply the jump to the "efficient RPS" frequency on startup Chris Wilson
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2017-02-10 15:03 UTC (permalink / raw)
To: intel-gfx
If we receive a DOWN_TIMEOUT rps interrupt, we respond by reducing the
GPU clocks significantly. Before we do, double check that the frequency
we pick is actually a decrease.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_irq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 629a653a673e..d7f9e97ff8d8 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1219,7 +1219,7 @@ static void gen6_pm_rps_work(struct work_struct *work)
} else if (pm_iir & GEN6_PM_RP_DOWN_TIMEOUT) {
if (dev_priv->rps.cur_freq > dev_priv->rps.efficient_freq)
new_delay = dev_priv->rps.efficient_freq;
- else
+ else if (dev_priv->rps.cur_freq > dev_priv->rps.min_freq_softlimit)
new_delay = dev_priv->rps.min_freq_softlimit;
adj = 0;
} else if (pm_iir & GEN6_PM_RP_DOWN_THRESHOLD) {
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/3] drm/i915: Only apply the jump to the "efficient RPS" frequency on startup
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
2017-02-10 15:03 ` [PATCH 2/3] drm/i915: Don't accidentally increase the frequency in handling DOWN rps Chris Wilson
@ 2017-02-10 15:03 ` Chris Wilson
2017-02-14 16:19 ` Szwichtenberg, Radoslaw
2017-02-10 17:52 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview Patchwork
` (2 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Chris Wilson @ 2017-02-10 15:03 UTC (permalink / raw)
To: intel-gfx
Currently we apply the jump to rpe if we are below it and the GPU needs
more power. For some GPUs, the rpe is 75% of the maximum range causing
us to dramatically overshoot low power applications *and* unable to
reach the low frequency that can most efficiently deliver their
workload.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_irq.c | 8 --------
drivers/gpu/drm/i915/intel_pm.c | 11 +++++++++--
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index d7f9e97ff8d8..b8e0374bc9f5 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1206,14 +1206,6 @@ static void gen6_pm_rps_work(struct work_struct *work)
if (new_delay >= dev_priv->rps.max_freq_softlimit)
adj = 0;
- /*
- * For better performance, jump directly
- * to RPe if we're below it.
- */
- if (new_delay < dev_priv->rps.efficient_freq - adj) {
- new_delay = dev_priv->rps.efficient_freq;
- adj = 0;
- }
} else if (client_boost || any_waiters(dev_priv)) {
adj = 0;
} else if (pm_iir & GEN6_PM_RP_DOWN_TIMEOUT) {
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 2bf47f15eebe..77c454df8a3e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5019,6 +5019,8 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv)
{
mutex_lock(&dev_priv->rps.hw_lock);
if (dev_priv->rps.enabled) {
+ u8 freq;
+
if (dev_priv->pm_rps_events & (GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED))
gen6_rps_reset_ei(dev_priv);
I915_WRITE(GEN6_PMINTRMSK,
@@ -5026,9 +5028,14 @@ void gen6_rps_busy(struct drm_i915_private *dev_priv)
gen6_enable_rps_interrupts(dev_priv);
- /* Ensure we start at the user's desired frequency */
+ /* Use the user's desired frequency as a guide, but for better
+ * performance, jump directly to RPe as our starting frequency.
+ */
+ freq = max(dev_priv->rps.cur_freq,
+ dev_priv->rps.efficient_freq);
+
if (intel_set_rps(dev_priv,
- clamp(dev_priv->rps.cur_freq,
+ clamp(freq,
dev_priv->rps.min_freq_softlimit,
dev_priv->rps.max_freq_softlimit)))
DRM_DEBUG_DRIVER("Failed to set idle frequency\n");
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 9+ messages in thread* ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
2017-02-10 15:03 ` [PATCH 2/3] drm/i915: Don't accidentally increase the frequency in handling DOWN rps Chris Wilson
2017-02-10 15:03 ` [PATCH 3/3] drm/i915: Only apply the jump to the "efficient RPS" frequency on startup Chris Wilson
@ 2017-02-10 17:52 ` Patchwork
2017-02-10 22:52 ` ✓ Fi.CI.BAT: success " Patchwork
2017-02-14 15:28 ` [PATCH 1/3] " Szwichtenberg, Radoslaw
4 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2017-02-10 17:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
URL : https://patchwork.freedesktop.org/series/19461/
State : warning
== Summary ==
Series 19461v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/19461/revisions/1/mbox/
Test drv_module_reload:
Subgroup basic-reload-final:
pass -> DMESG-WARN (fi-skl-6770hq)
fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11
fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19
fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50
fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17
fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18
fi-skl-6770hq total:252 pass:241 dwarn:1 dfail:0 fail:0 skip:10
fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28
fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
de2ea45a48455f125439790c71bd1a5a7e82a167 drm-tip: 2017y-02m-10d-16h-49m-01s UTC integration manifest
023155a drm/i915: Only apply the jump to the "efficient RPS" frequency on startup
3dd4759 drm/i915: Don't accidentally increase the frequency in handling DOWN rps
f52b360 drm/i915: Enable fine-tuned RPS for cherryview
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3769/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
` (2 preceding siblings ...)
2017-02-10 17:52 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview Patchwork
@ 2017-02-10 22:52 ` Patchwork
2017-02-14 22:38 ` Chris Wilson
2017-02-14 15:28 ` [PATCH 1/3] " Szwichtenberg, Radoslaw
4 siblings, 1 reply; 9+ messages in thread
From: Patchwork @ 2017-02-10 22:52 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
URL : https://patchwork.freedesktop.org/series/19461/
State : success
== Summary ==
Series 19461v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/19461/revisions/1/mbox/
fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11
fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39
fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19
fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27
fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31
fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50
fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17
fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18
fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28
fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
4dbd7c0fbb78579ff491ef1184f78087055c5aa5 drm-tip: 2017y-02m-10d-21h-45m-14s UTC integration manifest
8de396f drm/i915: Only apply the jump to the "efficient RPS" frequency on startup
993cea9 drm/i915: Don't accidentally increase the frequency in handling DOWN rps
5615fc1 drm/i915: Enable fine-tuned RPS for cherryview
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3775/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
2017-02-10 22:52 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2017-02-14 22:38 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2017-02-14 22:38 UTC (permalink / raw)
To: intel-gfx
On Fri, Feb 10, 2017 at 10:52:02PM -0000, Patchwork wrote:
> == Series Details ==
>
> Series: series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview
> URL : https://patchwork.freedesktop.org/series/19461/
> State : success
>
> == Summary ==
>
> Series 19461v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/19461/revisions/1/mbox/
>
> fi-bdw-5557u total:252 pass:241 dwarn:0 dfail:0 fail:0 skip:11
> fi-bsw-n3050 total:252 pass:213 dwarn:0 dfail:0 fail:0 skip:39
> fi-bxt-j4205 total:252 pass:233 dwarn:0 dfail:0 fail:0 skip:19
> fi-bxt-t5700 total:83 pass:70 dwarn:0 dfail:0 fail:0 skip:12
> fi-byt-j1900 total:252 pass:225 dwarn:0 dfail:0 fail:0 skip:27
> fi-byt-n2820 total:252 pass:221 dwarn:0 dfail:0 fail:0 skip:31
> fi-hsw-4770 total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
> fi-hsw-4770r total:252 pass:236 dwarn:0 dfail:0 fail:0 skip:16
> fi-ilk-650 total:252 pass:202 dwarn:0 dfail:0 fail:0 skip:50
> fi-ivb-3520m total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
> fi-ivb-3770 total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
> fi-kbl-7500u total:252 pass:234 dwarn:0 dfail:0 fail:0 skip:18
> fi-skl-6260u total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
> fi-skl-6700hq total:252 pass:235 dwarn:0 dfail:0 fail:0 skip:17
> fi-skl-6700k total:252 pass:230 dwarn:4 dfail:0 fail:0 skip:18
> fi-skl-6770hq total:252 pass:242 dwarn:0 dfail:0 fail:0 skip:10
> fi-snb-2520m total:252 pass:224 dwarn:0 dfail:0 fail:0 skip:28
> fi-snb-2600 total:252 pass:223 dwarn:0 dfail:0 fail:0 skip:29
>
> 4dbd7c0fbb78579ff491ef1184f78087055c5aa5 drm-tip: 2017y-02m-10d-21h-45m-14s UTC integration manifest
> 8de396f drm/i915: Only apply the jump to the "efficient RPS" frequency on startup
> 993cea9 drm/i915: Don't accidentally increase the frequency in handling DOWN rps
> 5615fc1 drm/i915: Enable fine-tuned RPS for cherryview
Thanks for the review, pushed.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
` (3 preceding siblings ...)
2017-02-10 22:52 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2017-02-14 15:28 ` Szwichtenberg, Radoslaw
4 siblings, 0 replies; 9+ messages in thread
From: Szwichtenberg, Radoslaw @ 2017-02-14 15:28 UTC (permalink / raw)
To: intel-gfx@lists.freedesktop.org, chris@chris-wilson.co.uk
On Fri, 2017-02-10 at 15:03 +0000, Chris Wilson wrote:
> When the RPS tuning was applied to Baytrail, in commit 8fb55197e64d
> ("drm/i915: Agressive downclocking on Baytrail"), concern was given that
> it might cause Cherryview excess wakeups of the common power well.
> However, the static thresholds perform poorly for Kodi, and the GPU is
> unable to deliver the video frames on time. Enabling the dynamic, finer
> thresholds used on all other platforms (including Skylake and Broxton
> that also have the same multiple powerwell concerns) allows the GPU to
> pick a more appropriate frequency and not drop frames.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-02-14 22:38 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-10 15:03 [PATCH 1/3] drm/i915: Enable fine-tuned RPS for cherryview Chris Wilson
2017-02-10 15:03 ` [PATCH 2/3] drm/i915: Don't accidentally increase the frequency in handling DOWN rps Chris Wilson
2017-02-14 15:25 ` Szwichtenberg, Radoslaw
2017-02-10 15:03 ` [PATCH 3/3] drm/i915: Only apply the jump to the "efficient RPS" frequency on startup Chris Wilson
2017-02-14 16:19 ` Szwichtenberg, Radoslaw
2017-02-10 17:52 ` ✗ Fi.CI.BAT: warning for series starting with [1/3] drm/i915: Enable fine-tuned RPS for cherryview Patchwork
2017-02-10 22:52 ` ✓ Fi.CI.BAT: success " Patchwork
2017-02-14 22:38 ` Chris Wilson
2017-02-14 15:28 ` [PATCH 1/3] " Szwichtenberg, Radoslaw
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox