drm/i915: Make intel_bw_check_sagv_mask() internal to intel_bw.c

The only thing between the current intel_bw_check_sagv_mask() call
site and intel_bw_atomic_check() is skl_wm_add_affected_planes()
which no longer depends on the sagv mask, so we can make life
a lot less confusing by calling intel_bw_check_sagv_mask() from
intel_bw_atomic_check() instead.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250326162544.3642-12-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 0553e902727e58203922a7e399041bff5c6cb987..b54704f9af4eb2da71c47fd063258cdda7c7b3ed 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -1443,7 +1443,7 @@ int intel_bw_modeset_checks(struct intel_atomic_state *state)
        return 0;
 }
 
-int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
+static int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
 {
        struct intel_display *display = to_intel_display(state);
        struct drm_i915_private *i915 = to_i915(display->drm);
@@ -1492,6 +1492,13 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
        const struct intel_bw_state *old_bw_state;
        int ret;
 
+       if (DISPLAY_VER(i915) < 9)
+               return 0;
+
+       ret = intel_bw_check_sagv_mask(state);
+       if (ret)
+               return ret;
+
        /* FIXME earlier gens need some checks too */
        if (DISPLAY_VER(display) < 11)
                return 0;

diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
index ee1d437340f3b42995dfca9cd3e50c0381bd9bf6..ac435674c3edca4334b462d6cb93b55cb1899cd3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.h
+++ b/drivers/gpu/drm/i915/display/intel_bw.h
@@ -67,7 +67,6 @@ 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_check_sagv_mask(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/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 747b2b5c31bdb5ac1f66dda56658025407636ffe..baf345039deb5a911c2a8922a3e02b950b22af4d 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -454,7 +454,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state)
 {
        struct intel_display *display = to_intel_display(state);
        struct drm_i915_private *i915 = to_i915(state->base.dev);
-       int ret;
        struct intel_crtc *crtc;
        struct intel_crtc_state *new_crtc_state;
        int i;
@@ -485,10 +484,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state)
                        intel_crtc_can_enable_sagv(new_crtc_state);
        }
 
-       ret = intel_bw_check_sagv_mask(state);
-       if (ret)
-               return ret;
-
        return 0;
 }