drm/i915/dp: Remove unused joiner helpers

The helpers intel_dp_num_joined_pipes() and intel_dp_needs_joiner() are no
longer used now that joiner selection iterates over all candidates.
Remove them.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260202103731.357416-12-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index cba893cf356abb80cc583a58a38960fd121ef9ed..6a4edf1538a6f97e9d900b4714d207b842b85261 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1376,43 +1376,6 @@ int intel_dp_max_hdisplay_per_pipe(struct intel_display *display)
        return DISPLAY_VER(display) >= 30 ? 6144 : 5120;
 }
 
-static
-bool intel_dp_needs_joiner(struct intel_dp *intel_dp,
-                          struct intel_connector *connector,
-                          int hdisplay, int clock,
-                          int num_joined_pipes)
-{
-       struct intel_display *display = to_intel_display(intel_dp);
-
-       if (!intel_dp_has_joiner(intel_dp))
-               return false;
-
-       num_joined_pipes /= 2;
-
-       return clock > num_joined_pipes * display->cdclk.max_dotclk_freq ||
-              hdisplay > num_joined_pipes * intel_dp_max_hdisplay_per_pipe(display);
-}
-
-int intel_dp_num_joined_pipes(struct intel_dp *intel_dp,
-                             struct intel_connector *connector,
-                             int hdisplay, int clock)
-{
-       struct intel_display *display = to_intel_display(intel_dp);
-
-       if (connector->force_joined_pipes)
-               return connector->force_joined_pipes;
-
-       if (HAS_ULTRAJOINER(display) &&
-           intel_dp_needs_joiner(intel_dp, connector, hdisplay, clock, 4))
-               return 4;
-
-       if ((HAS_BIGJOINER(display) || HAS_UNCOMPRESSED_JOINER(display)) &&
-           intel_dp_needs_joiner(intel_dp, connector, hdisplay, clock, 2))
-               return 2;
-
-       return 1;
-}
-
 bool intel_dp_has_dsc(const struct intel_connector *connector)
 {
        struct intel_display *display = to_intel_display(connector);

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 6d409c1998c985ed54965ad4b2aeea49d9bf6610..ebaa35d23c9c3c134d666864789d925a507c47fd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -153,10 +153,6 @@ bool intel_dp_dsc_valid_compressed_bpp(struct intel_dp *intel_dp, int bpp_x16);
 u8 intel_dp_dsc_get_slice_count(const struct intel_connector *connector,
                                int mode_clock, int mode_hdisplay,
                                int num_joined_pipes);
-int intel_dp_num_joined_pipes(struct intel_dp *intel_dp,
-                             struct intel_connector *connector,
-                             int hdisplay, int clock);
-
 static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
 {
        return ~((1 << lane_count) - 1) & 0xf;