drm/i915/bw: Skip the bw_state->active_pipes update if no pipe is changing its active...

Currently we may end up doing a bunch of redundant bw_state
recomputation whenever any modeset happens. Skip a bunch of
that by only considering whether any pipe actually changes
its active state.

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

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index ac6da20d9529f1aea2031e9fcfc844b04f977845..f05b9a35f17a52b2eda63ea3ad78bf88c0188c79 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -13,6 +13,7 @@
 #include "intel_atomic.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
+#include "intel_crtc.h"
 #include "intel_display_core.h"
 #include "intel_display_regs.h"
 #include "intel_display_types.h"
@@ -1530,10 +1531,14 @@ static 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;
+       int ret;
 
        if (DISPLAY_VER(display) < 9)
                return 0;
 
+       if (!intel_any_crtc_active_changed(state))
+               return 0;
+
        new_bw_state = intel_atomic_get_bw_state(state);
        if (IS_ERR(new_bw_state))
                return PTR_ERR(new_bw_state);
@@ -1543,13 +1548,9 @@ static int intel_bw_modeset_checks(struct intel_atomic_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;
-       }
+       ret = intel_atomic_lock_global_state(&new_bw_state->base);
+       if (ret)
+               return ret;
 
        return 0;
 }
@@ -1599,7 +1600,7 @@ static int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
        return 0;
 }
 
-int intel_bw_atomic_check(struct intel_atomic_state *state, bool any_ms)
+int intel_bw_atomic_check(struct intel_atomic_state *state)
 {
        struct intel_display *display = to_intel_display(state);
        bool changed = false;
@@ -1610,11 +1611,9 @@ int intel_bw_atomic_check(struct intel_atomic_state *state, bool any_ms)
        if (DISPLAY_VER(display) < 9)
                return 0;
 
-       if (any_ms) {
-               ret = intel_bw_modeset_checks(state);
-               if (ret)
-                       return ret;
-       }
+       ret = intel_bw_modeset_checks(state);
+       if (ret)
+               return ret;
 
        ret = intel_bw_check_sagv_mask(state);
        if (ret)

diff --git a/drivers/gpu/drm/i915/display/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
index d51f50c9d30219248e5799851e3d32a41e177bd2..c064e80a7a7ff0ef779e53804cbf5cc5d90d327c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.h
+++ b/drivers/gpu/drm/i915/display/intel_bw.h
@@ -28,7 +28,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_atomic_check(struct intel_atomic_state *state, bool any_ms);
+int intel_bw_atomic_check(struct intel_atomic_state *state);
 int intel_bw_calc_min_cdclk(struct intel_atomic_state *state,
                            bool *need_cdclk_calc);
 int intel_bw_min_cdclk(struct intel_display *display,

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b57efd8707743eb1b5a2b377fba8d6955af89825..349daf985b982a59641a3757adf45f011da8e7d0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6434,7 +6434,7 @@ int intel_atomic_check(struct drm_device *dev,
        if (ret)
                goto fail;
 
-       ret = intel_bw_atomic_check(state, any_ms);
+       ret = intel_bw_atomic_check(state);
        if (ret)
                goto fail;