Re: [PATCH 2/4] drm/i915/dp: Limit for_each_joiner_candidate() on joiner pipes available

On 8/7/2026 6:04 PM, Jani Nikula wrote:
> 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 <[email protected]>
> Signed-off-by: Jani Nikula <[email protected]>

LGTM.

Reviewed-by: Ankit Nautiyal <[email protected]>


> ---
>   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 437b9e7bb864..e1604bc895e5 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,