[PATCH 3/6] drm/i915/dp: Move num_joined_pipes and related checks together

[Ankit Nautiyal]

Move the calculation of `num_joined_pipes` and other constraints that
depend on it, into a single block.
This groups all joiner-dependent logic together, preparing the code for a
future loop-based evaluation of multiple joiner configurations.

Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index 62f28f14423e..0884826de1fd 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1495,20 +1495,9 @@ intel_dp_mode_valid(struct drm_connector *_connector,
                target_clock = fixed_mode->clock;
        }
 
-       num_joined_pipes = intel_dp_num_joined_pipes(intel_dp, connector,
-                                                    mode->hdisplay, 
target_clock);
-       max_dotclk *= num_joined_pipes;
-
        sink_format = intel_dp_sink_format(connector, mode);
        output_format = intel_dp_output_format(connector, sink_format);
 
-       status = intel_pfit_mode_valid(display, mode, output_format, 
num_joined_pipes);
-       if (status != MODE_OK)
-               return status;
-
-       if (target_clock > max_dotclk)
-               return MODE_CLOCK_HIGH;
-
        max_link_clock = intel_dp_max_link_rate(intel_dp);
        max_lanes = intel_dp_max_lane_count(intel_dp);
 
@@ -1517,6 +1506,17 @@ intel_dp_mode_valid(struct drm_connector *_connector,
        mode_rate = intel_dp_link_required(target_clock,
                                           
intel_dp_mode_min_output_bpp(connector, mode));
 
+       num_joined_pipes = intel_dp_num_joined_pipes(intel_dp, connector,
+                                                    mode->hdisplay, 
target_clock);
+       max_dotclk *= num_joined_pipes;
+
+       status = intel_pfit_mode_valid(display, mode, output_format, 
num_joined_pipes);
+       if (status != MODE_OK)
+               return status;
+
+       if (target_clock > max_dotclk)
+               return MODE_CLOCK_HIGH;
+
        if (intel_dp_has_dsc(connector)) {
                get_dsc_slice_and_bpp(connector, mode, target_clock,
                                      num_joined_pipes,
-- 
2.45.2