diff options
| author | Sagar Arun Kamble | 2017-01-20 04:48:24 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-01-20 10:32:47 +0100 |
| commit | 7e79a6836cfd1bac20e2be3fafdc3caca27c9d69 (patch) | |
| tree | 4822ce51525e1316362e0e5c12b033e627b99ea3 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915: Remove the double handling of 'flags from intel_mode_from_pipe_conf... (diff) | |
| download | kernel-qcow2-linux-7e79a6836cfd1bac20e2be3fafdc3caca27c9d69.tar.gz kernel-qcow2-linux-7e79a6836cfd1bac20e2be3fafdc3caca27c9d69.tar.xz kernel-qcow2-linux-7e79a6836cfd1bac20e2be3fafdc3caca27c9d69.zip | |
drm/i915: Set adjustment to zero on Up/Down interrupts if freq is already max/min
When we reach the user's RPS limits, stop requesting an adjustment. Even
though we will clamp the requested frequency later, we rely on interrupt
masking to disable further adjustments in the same direction. Even
though it is unlikely (one scenario is a bug in the driver, another is
careful manipulation through the uAPI) if we keep exponentially
increasing the adjustment value, it will wrap and cause a negative
adjustment.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484884104-28134-2-git-send-email-sagar.a.kamble@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index ce5663d94839..6fefc34ef602 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1170,6 +1170,9 @@ static void gen6_pm_rps_work(struct work_struct *work) adj *= 2; else /* CHV needs even encode values */ adj = IS_CHERRYVIEW(dev_priv) ? 2 : 1; + + if (new_delay >= dev_priv->rps.max_freq_softlimit) + adj = 0; /* * For better performance, jump directly * to RPe if we're below it. @@ -1191,6 +1194,9 @@ static void gen6_pm_rps_work(struct work_struct *work) adj *= 2; else /* CHV needs even encode values */ adj = IS_CHERRYVIEW(dev_priv) ? -2 : -1; + + if (new_delay <= dev_priv->rps.min_freq_softlimit) + adj = 0; } else { /* unknown event */ adj = 0; } |