drm/i915: Fix display bpp limit computation during system resume

The system resume display mode restoration should happen with an output
configuration matching that of the suspend time saved mode. Since the
restored mode configuration is subject to the bpp fallback logic,
starting out with an unlimited bpp and reducing the bpp as required by
any (MST) link BW limit, the resulting bpp will match the one during
suspend only if the BW limit checks during suspend and resume are
applied in an identical way. The latter is not guaranteed at the moment,
since the pre-suspend MST topology may not be in place during resume
(for instance if the MST sink was disconnected while being suspended),
which makes the MST link BW check accept the unlimited bpp mode
configuration unconditionally without ensuring that the required BW fits
into the available MST link BW.

To fix the above, initialize the bpp fallback logic with the max link
bpp / force-FEC limits left behind by the suspend time mode save.

Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240220211841.448846-4-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 607117ac21684544921b073f090c70ea2fa61ea1..862ca6f9f3813ef0d0d085ea5ce9115f5a33be60 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6253,12 +6253,11 @@ static int intel_atomic_check_config(struct intel_atomic_state *state,
 
 static int intel_atomic_check_config_and_link(struct intel_atomic_state *state)
 {
-       struct drm_i915_private *i915 = to_i915(state->base.dev);
        struct intel_link_bw_limits new_limits;
        struct intel_link_bw_limits old_limits;
        int ret;
 
-       intel_link_bw_init_limits(i915, &new_limits);
+       intel_link_bw_init_limits(state, &new_limits);
        old_limits = new_limits;
 
        while (true) {

diff --git a/drivers/gpu/drm/i915/display/intel_link_bw.c b/drivers/gpu/drm/i915/display/intel_link_bw.c
index 9c6d35a405a1822feb9a6c126439ece79b781303..27ea858897c9f4499eda1e3434fcc475dac37eaf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_link_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_link_bw.c
@@ -6,6 +6,7 @@
 #include "i915_drv.h"
 
 #include "intel_atomic.h"
+#include "intel_crtc.h"
 #include "intel_display_types.h"
 #include "intel_dp_mst.h"
 #include "intel_fdi.h"
@@ -13,19 +14,32 @@
 
 /**
  * intel_link_bw_init_limits - initialize BW limits
- * @i915: device instance
+ * @state: Atomic state
  * @limits: link BW limits
  *
  * Initialize @limits.
  */
-void intel_link_bw_init_limits(struct drm_i915_private *i915, struct intel_link_bw_limits *limits)
+void intel_link_bw_init_limits(struct intel_atomic_state *state,
+                              struct intel_link_bw_limits *limits)
 {
+       struct drm_i915_private *i915 = to_i915(state->base.dev);
        enum pipe pipe;
 
        limits->force_fec_pipes = 0;
        limits->bpp_limit_reached_pipes = 0;
-       for_each_pipe(i915, pipe)
-               limits->max_bpp_x16[pipe] = INT_MAX;
+       for_each_pipe(i915, pipe) {
+               const struct intel_crtc_state *crtc_state =
+                       intel_atomic_get_new_crtc_state(state,
+                                                       intel_crtc_for_pipe(i915, pipe));
+
+               if (state->base.duplicated && crtc_state) {
+                       limits->max_bpp_x16[pipe] = crtc_state->max_link_bpp_x16;
+                       if (crtc_state->fec_enable)
+                               limits->force_fec_pipes |= BIT(pipe);
+               } else {
+                       limits->max_bpp_x16[pipe] = INT_MAX;
+               }
+       }
 }
 
 /**

diff --git a/drivers/gpu/drm/i915/display/intel_link_bw.h b/drivers/gpu/drm/i915/display/intel_link_bw.h
index 2cf57307cc2491451fcdc28b44753da2a1fb6935..6b0ccfff59dab4cf554da1b6aaf118fad39b64b4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_link_bw.h
+++ b/drivers/gpu/drm/i915/display/intel_link_bw.h
@@ -22,7 +22,7 @@ struct intel_link_bw_limits {
        int max_bpp_x16[I915_MAX_PIPES];
 };
 
-void intel_link_bw_init_limits(struct drm_i915_private *i915,
+void intel_link_bw_init_limits(struct intel_atomic_state *state,
                               struct intel_link_bw_limits *limits);
 int intel_link_bw_reduce_bpp(struct intel_atomic_state *state,
                             struct intel_link_bw_limits *limits,