From 1dff85f86b4673f6857c209041e2357e35e3397e Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 7 Aug 2026 15:34:05 +0300 Subject: [PATCH] drm/i915/dp: Limit for_each_joiner_candidate() on joiner pipes available Make intel_dp_can_join(), and subsequently intel_dp_joiner_candidate_valid() and for_each_joiner_candidate() more strict about pipes actually available for joining by using intel_joiner_valid_primary_pipe_mask(). This rejects some invalid combos early for both mode enumeration and compute config. Cc: Ankit Nautiyal Reviewed-by: Ankit Nautiyal Link: https://patch.msgid.link/efc330687f8299e5725564c3ed90d5d8e6aa0eb2.1786105831.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dp.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 45867f7eb300..833375bd2c0c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1274,17 +1274,7 @@ bool intel_dp_can_join(struct intel_dp *intel_dp, if (num_joined_pipes > 1 && !intel_dp_has_joiner(intel_dp)) return false; - switch (num_joined_pipes) { - case 1: - return true; - case 2: - return HAS_BIGJOINER(display) || - HAS_UNCOMPRESSED_JOINER(display); - case 4: - return HAS_ULTRAJOINER(display); - default: - return false; - } + return intel_joiner_valid_primary_pipe_mask(display, num_joined_pipes); } bool intel_dp_dotclk_valid(struct intel_display *display,