On Tue, 2022-03-15 at 15:27 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Now that DRRS can operate on multiple pipes we need to make sure
> one pipe doesn't throw away the other pipe's frontbuffer_bits before
> said pipe can handle them.
>
Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_drrs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
> index e1b41b772521..e9d622fe66b3 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.c
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.c
> @@ -258,7 +258,7 @@ static void intel_drrs_downclock_work(struct work_struct *work)
> }
>
> static void intel_drrs_frontbuffer_update(struct drm_i915_private *dev_priv,
> - unsigned int frontbuffer_bits,
> + unsigned int all_frontbuffer_bits,
> bool invalidate)
> {
> struct intel_crtc *crtc;
> @@ -267,6 +267,8 @@ static void intel_drrs_frontbuffer_update(struct drm_i915_private *dev_priv,
> return;
>
> for_each_intel_crtc(&dev_priv->drm, crtc) {
> + unsigned int frontbuffer_bits;
> +
> cancel_delayed_work(&crtc->drrs.work);
>
> mutex_lock(&crtc->drrs.mutex);
> @@ -276,7 +278,7 @@ static void intel_drrs_frontbuffer_update(struct drm_i915_private *dev_priv,
> continue;
> }
>
> - frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(crtc->pipe);
> + frontbuffer_bits = all_frontbuffer_bits & INTEL_FRONTBUFFER_ALL_MASK(crtc->pipe);
> if (invalidate)
> crtc->drrs.busy_frontbuffer_bits |= frontbuffer_bits;
> else
