drm/i915/fbc: Pass around FBC instance instead of crtc

Pass the FBC instance instead of the crtc to a bunch of places.

We also adjust intel_fbc_post_update() to do the
intel_fbc_get_reg_params() things instead of doing it from the lower
level function (which also gets called for front buffer tracking).
Nothing in there will change during front buffer updates.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211124113652.22090-8-ville.syrjala@linux.intel.com
Reviewed-by: Mika Kahola <mika.kahola@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 8625825cbee8814220d9e15ff097cc415e788baf..db390c29c665f2511920ef25c82c2d124473c2f0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1091,10 +1091,9 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
        return 0;
 }
 
-static bool intel_fbc_can_activate(struct intel_crtc *crtc)
+static bool intel_fbc_can_activate(struct intel_fbc *fbc)
 {
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
-       struct intel_fbc *fbc = &i915->fbc;
+       struct drm_i915_private *i915 = fbc->i915;
        struct intel_fbc_state *cache = &fbc->state_cache;
 
        if (!intel_fbc_can_enable(fbc))
@@ -1186,7 +1185,7 @@ static bool intel_fbc_can_flip_nuke(struct intel_atomic_state *state,
        if (drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi))
                return false;
 
-       if (!intel_fbc_can_activate(crtc))
+       if (!intel_fbc_can_activate(fbc))
                return false;
 
        if (!old_fb || !new_fb)
@@ -1280,18 +1279,12 @@ static void __intel_fbc_disable(struct intel_fbc *fbc)
        fbc->crtc = NULL;
 }
 
-static void __intel_fbc_post_update(struct intel_crtc *crtc)
+static void __intel_fbc_post_update(struct intel_fbc *fbc)
 {
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
-       struct intel_fbc *fbc = &i915->fbc;
+       struct drm_i915_private *i915 = fbc->i915;
 
        drm_WARN_ON(&i915->drm, !mutex_is_locked(&fbc->lock));
 
-       if (fbc->crtc != crtc)
-               return;
-
-       fbc->flip_pending = false;
-
        if (!i915->params.enable_fbc) {
                intel_fbc_deactivate(fbc, "disabled at runtime per module param");
                __intel_fbc_disable(fbc);
@@ -1299,9 +1292,7 @@ static void __intel_fbc_post_update(struct intel_crtc *crtc)
                return;
        }
 
-       intel_fbc_get_reg_params(fbc, crtc);
-
-       if (!intel_fbc_can_activate(crtc))
+       if (!intel_fbc_can_activate(fbc))
                return;
 
        if (!fbc->busy_bits)
@@ -1322,7 +1313,11 @@ void intel_fbc_post_update(struct intel_atomic_state *state,
                return;
 
        mutex_lock(&fbc->lock);
-       __intel_fbc_post_update(crtc);
+       if (fbc->crtc == crtc) {
+               fbc->flip_pending = false;
+               intel_fbc_get_reg_params(fbc, crtc);
+               __intel_fbc_post_update(fbc);
+       }
        mutex_unlock(&fbc->lock);
 }
 
@@ -1376,7 +1371,7 @@ void intel_fbc_flush(struct drm_i915_private *i915,
                if (fbc->active)
                        intel_fbc_nuke(fbc);
                else if (!fbc->flip_pending)
-                       __intel_fbc_post_update(fbc->crtc);
+                       __intel_fbc_post_update(fbc);
        }
 
 out: