drm/i915/cdclk: Decouple cdclk from state->modeset

There's no real reason anymore to tie cdclk updates to
state->modeset/any_ms. Always call the cdclk functions and
allow them to decide whether cdclk update is necessary/desired
or not.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250923171943.7319-17-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 b45b84293cba21a87615f54cc46a33d5896afe5a..a08933e769ae9e839254e94f1ee6dcef986346df 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -2708,6 +2708,9 @@ intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state)
        struct intel_cdclk_config cdclk_config;
        enum pipe pipe;
 
+       if (!new_cdclk_state)
+               return;
+
        if (!intel_cdclk_changed(&old_cdclk_state->actual,
                                 &new_cdclk_state->actual))
                return;
@@ -2760,6 +2763,9 @@ intel_set_cdclk_post_plane_update(struct intel_atomic_state *state)
                intel_atomic_get_new_cdclk_state(state);
        enum pipe pipe;
 
+       if (!new_cdclk_state)
+               return;
+
        if (!intel_cdclk_changed(&old_cdclk_state->actual,
                                 &new_cdclk_state->actual))
                return;

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 349daf985b982a59641a3757adf45f011da8e7d0..c9bd160c7b32d9f927619bdb79980968eb984a1b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6305,6 +6305,7 @@ int intel_atomic_check(struct drm_device *dev,
        struct intel_atomic_state *state = to_intel_atomic_state(_state);
        struct intel_crtc_state *old_crtc_state, *new_crtc_state;
        struct intel_crtc *crtc;
+       bool need_cdclk_calc = false;
        int ret, i;
        bool any_ms = false;
 
@@ -6438,7 +6439,7 @@ int intel_atomic_check(struct drm_device *dev,
        if (ret)
                goto fail;
 
-       ret = intel_cdclk_atomic_check(state, &any_ms);
+       ret = intel_cdclk_atomic_check(state, &need_cdclk_calc);
        if (ret)
                goto fail;
 
@@ -6449,7 +6450,9 @@ int intel_atomic_check(struct drm_device *dev,
                ret = intel_modeset_checks(state);
                if (ret)
                        goto fail;
+       }
 
+       if (need_cdclk_calc) {
                ret = intel_modeset_calc_cdclk(state);
                if (ret)
                        return ret;
@@ -7361,13 +7364,13 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
         */
        intel_pmdemand_pre_plane_update(state);
 
-       if (state->modeset) {
+       if (state->modeset)
                drm_atomic_helper_update_legacy_modeset_state(display->drm, &state->base);
 
-               intel_set_cdclk_pre_plane_update(state);
+       intel_set_cdclk_pre_plane_update(state);
 
+       if (state->modeset)
                intel_modeset_verify_disabled(state);
-       }
 
        intel_sagv_pre_plane_update(state);
 
@@ -7480,8 +7483,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
                intel_verify_planes(state);
 
        intel_sagv_post_plane_update(state);
-       if (state->modeset)
-               intel_set_cdclk_post_plane_update(state);
+       intel_set_cdclk_post_plane_update(state);
        intel_pmdemand_post_plane_update(state);
 
        drm_atomic_helper_commit_hw_done(&state->base);