> -----Original Message-----
> From: Intel-gfx <intel-gfx-boun...@lists.freedesktop.org> On Behalf Of Ville
> Syrjala
> Sent: Monday, June 20, 2022 9:29 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH 1/2] drm/i915/fbc: Move flip_pending assignmnt
>
> From: Ville Syrjälä <ville.syrj...@linux.intel.com>
>
> Move the flip_pending assignment into __intel_fbc_post_update() from
> intel_fbc_post_update(). Now mirrors the pre_update() side.
>
> The only reason the assignment was in the higher level function is that we
> used
> to call __intel_fbc_post_update() from elsewhere as well. That got cleaned up
> in
> commit b39d2c620242 ("drm/i915/fbc:
> Call intel_fbc_activate() directly from frontbuffer flush")
>
Reviewed-by: Mika Kahola <mika.kah...@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fbc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c
> b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 8b807284cde1..77669e03b9f7 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -1296,6 +1296,8 @@ static void __intel_fbc_post_update(struct intel_fbc
> *fbc)
>
> drm_WARN_ON(&i915->drm, !mutex_is_locked(&fbc->lock));
>
> + fbc->flip_pending = false;
> +
> if (!fbc->busy_bits)
> intel_fbc_activate(fbc);
> else
> @@ -1317,10 +1319,8 @@ void intel_fbc_post_update(struct
> intel_atomic_state *state,
>
> mutex_lock(&fbc->lock);
>
> - if (fbc->state.plane == plane) {
> - fbc->flip_pending = false;
> + if (fbc->state.plane == plane)
> __intel_fbc_post_update(fbc);
> - }
>
> mutex_unlock(&fbc->lock);
> }
> --
> 2.35.1
