drm/i915: Extract intel_bw_modeset_checks()

Pull the new_bw_state->active_pipes computation out from
intel_compute_sagv_mask() and move it into the intel_bw.c
(which is arguably the correct place for it).

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250326162544.3642-10-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index 47de106c608fb17896b91bac35e84527eda4e997..dcf2b711b83abf004459cf5b3f5286d940539db5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -1414,6 +1414,35 @@ static int intel_bw_check_data_rate(struct intel_atomic_state *state, bool *chan
        return 0;
 }
 
+int intel_bw_modeset_checks(struct intel_atomic_state *state)
+{
+       struct intel_display *display = to_intel_display(state);
+       const struct intel_bw_state *old_bw_state;
+       struct intel_bw_state *new_bw_state;
+
+       if (DISPLAY_VER(display) < 9)
+               return 0;
+
+       new_bw_state = intel_atomic_get_bw_state(state);
+       if (IS_ERR(new_bw_state))
+               return PTR_ERR(new_bw_state);
+
+       old_bw_state = intel_atomic_get_old_bw_state(state);
+
+       new_bw_state->active_pipes =
+               intel_calc_active_pipes(state, old_bw_state->active_pipes);
+
+       if (new_bw_state->active_pipes != old_bw_state->active_pipes) {
+               int ret;
+
+               ret = intel_atomic_lock_global_state(&new_bw_state->base);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 int intel_bw_atomic_check(struct intel_atomic_state *state)
 {
        struct intel_display *display = to_intel_display(state);

diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
index 4a6a033f11e4065357322a2d7740d04da70c12e9..ac435674c3edca4334b462d6cb93b55cb1899cd3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.h
+++ b/drivers/gpu/drm/i915/display/intel_bw.h
@@ -66,6 +66,7 @@ intel_atomic_get_bw_state(struct intel_atomic_state *state);
 
 void intel_bw_init_hw(struct intel_display *display);
 int intel_bw_init(struct intel_display *display);
+int intel_bw_modeset_checks(struct intel_atomic_state *state);
 int intel_bw_atomic_check(struct intel_atomic_state *state);
 int icl_pcode_restrict_qgv_points(struct intel_display *display,
                                  u32 points_mask);

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index d448ee4f4a10bf409f4af93e9050b897e276c1c3..2a58a1a16cdfd486c0c371d88d3429655f205471 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6443,6 +6443,12 @@ int intel_atomic_check(struct drm_device *dev,
        if (ret)
                goto fail;
 
+       if (any_ms) {
+               ret = intel_bw_modeset_checks(state);
+               if (ret)
+                       goto fail;
+       }
+
        ret = intel_compute_global_watermarks(state);
        if (ret)
                goto fail;

diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index a6af5e4ba4d4fa9f9e1489a3fc29943e33bd3eb1..1da1bfeadd9ce9da7bae316c455ea3b394bf6a00 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -501,15 +501,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state)
        if (!new_bw_state)
                return 0;
 
-       new_bw_state->active_pipes =
-               intel_calc_active_pipes(state, old_bw_state->active_pipes);
-
-       if (new_bw_state->active_pipes != old_bw_state->active_pipes) {
-               ret = intel_atomic_lock_global_state(&new_bw_state->base);
-               if (ret)
-                       return ret;
-       }
-
        if (intel_can_enable_sagv(i915, new_bw_state) !=
            intel_can_enable_sagv(i915, old_bw_state)) {
                ret = intel_atomic_serialize_global_state(&new_bw_state->base);