drm/i915/dp_mst: Simplify handling the single-bpp case during state computation

A follow-up change wants to skip invalid bpps in the bpp select loop of
a stream state computation. To allow for that, using the usual
'continue' statement in the loop, change the way the single-bpp range is
handled.

v2: Fix typo in commit message. (Ankit)

Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250509180340.554867-3-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 06f4ad8de591e61ddcccc41ab5b984fe3b9ed3a0..fa969b46245cdb7d523c3c60b9b469fd8f93d01e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -263,6 +263,12 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp,
                                           fxp_q4_to_frac(max_bpp_x16) ||
                                           fxp_q4_to_frac(bpp_step_x16)));
 
+       if (!bpp_step_x16) {
+               /* Allow using zero step only to indicate single try for a given bpp. */
+               drm_WARN_ON(display->drm, min_bpp_x16 != max_bpp_x16);
+               bpp_step_x16 = 1;
+       }
+
        if (is_mst) {
                mst_state = drm_atomic_get_mst_topology_state(state, &intel_dp->mst.mgr);
                if (IS_ERR(mst_state))
@@ -386,10 +392,6 @@ int intel_dp_mtp_tu_compute_config(struct intel_dp *intel_dp,
 
                        break;
                }
-
-               /* Allow using zero step to indicate one try */
-               if (!bpp_step_x16)
-                       break;
        }
 
        if (slots < 0) {