Commit 3f88dde6 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Apply the aggressive downclocking to parking

We treat parking as a manual RPS timeout event, and downclock the GPU
for the next unpark and batch execution. However, having restored the
aggressive downclocking and observed that we have very light workloads
whose only interaction is through the manual parking events, carry over
the aggressive downclocking to the fake RPS events.

References: 21abf0bf ("drm/i915/gt: Treat idling as a RPS downclock event")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200429205446.3259-5-chris@chris-wilson.co.uk
parent 36d516be
...@@ -822,8 +822,6 @@ void intel_rps_unpark(struct intel_rps *rps) ...@@ -822,8 +822,6 @@ void intel_rps_unpark(struct intel_rps *rps)
rps->min_freq_softlimit, rps->min_freq_softlimit,
rps->max_freq_softlimit)); rps->max_freq_softlimit));
rps->last_adj = 0;
mutex_unlock(&rps->lock); mutex_unlock(&rps->lock);
rps->pm_iir = 0; rps->pm_iir = 0;
...@@ -838,6 +836,8 @@ void intel_rps_unpark(struct intel_rps *rps) ...@@ -838,6 +836,8 @@ void intel_rps_unpark(struct intel_rps *rps)
void intel_rps_park(struct intel_rps *rps) void intel_rps_park(struct intel_rps *rps)
{ {
int adj;
if (!intel_rps_clear_active(rps)) if (!intel_rps_clear_active(rps))
return; return;
...@@ -876,8 +876,13 @@ void intel_rps_park(struct intel_rps *rps) ...@@ -876,8 +876,13 @@ void intel_rps_park(struct intel_rps *rps)
* (Note we accommodate Cherryview's limitation of only using an * (Note we accommodate Cherryview's limitation of only using an
* even bin by applying it to all.) * even bin by applying it to all.)
*/ */
rps->cur_freq = adj = rps->last_adj;
max_t(int, round_down(rps->cur_freq - 1, 2), rps->min_freq); if (adj < 0)
adj *= 2;
else /* CHV needs even encode values */
adj = -2;
rps->last_adj = adj;
rps->cur_freq = max_t(int, rps->cur_freq + adj, rps->min_freq);
GT_TRACE(rps_to_gt(rps), "park:%x\n", rps->cur_freq); GT_TRACE(rps_to_gt(rps), "park:%x\n", rps->cur_freq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment