drm/i915/cdclk: Move intel_cdclk_atomic_check()

Move intel_cdclk_atomic_check() a bit so that we don't need an
extra intel_modeset_calc_cdclk() forward declaration.

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

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index dc10223cbc15d025fdbfc301cd976d683a1f1ef9..f2e092f89ddd72ea134b34fc9445e3d504395fac 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -3311,48 +3311,6 @@ static int intel_crtcs_calc_min_cdclk(struct intel_atomic_state *state,
        return 0;
 }
 
-static int intel_modeset_calc_cdclk(struct intel_atomic_state *state);
-
-int intel_cdclk_atomic_check(struct intel_atomic_state *state)
-{
-       const struct intel_cdclk_state *old_cdclk_state;
-       struct intel_cdclk_state *new_cdclk_state;
-       bool need_cdclk_calc = false;
-       int ret;
-
-       ret = intel_cdclk_modeset_checks(state, &need_cdclk_calc);
-       if (ret)
-               return ret;
-
-       ret = intel_crtcs_calc_min_cdclk(state, &need_cdclk_calc);
-       if (ret)
-               return ret;
-
-       ret = intel_bw_calc_min_cdclk(state, &need_cdclk_calc);
-       if (ret)
-               return ret;
-
-       old_cdclk_state = intel_atomic_get_old_cdclk_state(state);
-       new_cdclk_state = intel_atomic_get_new_cdclk_state(state);
-
-       if (new_cdclk_state &&
-           old_cdclk_state->force_min_cdclk != new_cdclk_state->force_min_cdclk) {
-               ret = intel_atomic_lock_global_state(&new_cdclk_state->base);
-               if (ret)
-                       return ret;
-
-               need_cdclk_calc = true;
-       }
-
-       if (need_cdclk_calc) {
-               ret = intel_modeset_calc_cdclk(state);
-               if (ret)
-                       return ret;
-       }
-
-       return 0;
-}
-
 int intel_cdclk_state_set_joined_mbus(struct intel_atomic_state *state, bool joined_mbus)
 {
        struct intel_cdclk_state *cdclk_state;
@@ -3503,6 +3461,46 @@ static int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
        return 0;
 }
 
+int intel_cdclk_atomic_check(struct intel_atomic_state *state)
+{
+       const struct intel_cdclk_state *old_cdclk_state;
+       struct intel_cdclk_state *new_cdclk_state;
+       bool need_cdclk_calc = false;
+       int ret;
+
+       ret = intel_cdclk_modeset_checks(state, &need_cdclk_calc);
+       if (ret)
+               return ret;
+
+       ret = intel_crtcs_calc_min_cdclk(state, &need_cdclk_calc);
+       if (ret)
+               return ret;
+
+       ret = intel_bw_calc_min_cdclk(state, &need_cdclk_calc);
+       if (ret)
+               return ret;
+
+       old_cdclk_state = intel_atomic_get_old_cdclk_state(state);
+       new_cdclk_state = intel_atomic_get_new_cdclk_state(state);
+
+       if (new_cdclk_state &&
+           old_cdclk_state->force_min_cdclk != new_cdclk_state->force_min_cdclk) {
+               ret = intel_atomic_lock_global_state(&new_cdclk_state->base);
+               if (ret)
+                       return ret;
+
+               need_cdclk_calc = true;
+       }
+
+       if (need_cdclk_calc) {
+               ret = intel_modeset_calc_cdclk(state);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 void intel_cdclk_update_hw_state(struct intel_display *display)
 {
        const struct intel_bw_state *bw_state =