Re: [PATCH i-g-t] tests/kms_dsc: Ensure non-joiner modes on non-joiner subtests

["Sharma, Swati2" <swati2.sharma@intel.com>]

Hi Karthik,

Please fix the subject.

It should be tests/intel/kms_dsc

Apart from this patch LGTM

Reviewed-by: Swati Sharma <swati2.sharma@intel.com>

On 18-06-2026 10:00 am, Karthik B S wrote:

> Ensure non-joiner subtests always pick non-joiner modes while iterating
> output-format modes. This prevents accidental natural joiner selection
> and avoids failures on the last pipe.
>
> Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/work_items/16368
> Fixes: 86679142531b ("tests/intel/kms_dsc: Add force dsc and joiner variants")
>
> Cc: Swati Sharma <swati2.sharma@intel.com>
> Signed-off-by: Karthik B S <karthik.b.s@intel.com>
> ---
>   tests/intel/kms_dsc.c           | 4 ++++
>   tests/intel/kms_joiner_helper.c | 8 ++++++++
>   tests/intel/kms_joiner_helper.h | 1 +
>   3 files changed, 13 insertions(+)
>
> diff --git a/tests/intel/kms_dsc.c b/tests/intel/kms_dsc.c
> index 3687e795d..8161bf7da 100644
> --- a/tests/intel/kms_dsc.c
> +++ b/tests/intel/kms_dsc.c
> @@ -251,6 +251,10 @@ static void update_display(data_t *data, uint32_t test_type)
>   		if (data->output_format != DSC_FORMAT_RGB)
>   			mode = get_next_mode(output, index++);
>   
> +		if (mode && data->force_joined_pipes == JOINED_PIPES_DEFAULT &&
> +		    intel_mode_needs_joiner(data->drm_fd, mode))
> +			continue;
> +
>   		if (mode == NULL)
>   			goto reset;
>   
> diff --git a/tests/intel/kms_joiner_helper.c b/tests/intel/kms_joiner_helper.c
> index cd7fe86bf..da0ac7f62 100644
> --- a/tests/intel/kms_joiner_helper.c
> +++ b/tests/intel/kms_joiner_helper.c
> @@ -225,6 +225,14 @@ bool intel_max_hdisplay_non_joiner_mode_found(int drm_fd, drmModeConnector *conn
>   	return found;
>   }
>   
> +bool intel_mode_needs_joiner(int drm_fd, drmModeModeInfo *mode)
> +{
> +	int max_dotclock = igt_get_max_dotclock(drm_fd);
> +
> +	return igt_bigjoiner_possible(drm_fd, mode, max_dotclock) ||
> +	       igt_ultrajoiner_possible(drm_fd, mode, max_dotclock);
> +}
> +
>   /**
>    * igt_is_joiner_supported_by_source:
>    * @drm_fd: drm file descriptor
> diff --git a/tests/intel/kms_joiner_helper.h b/tests/intel/kms_joiner_helper.h
> index 692dab022..a0ab75b2c 100644
> --- a/tests/intel/kms_joiner_helper.h
> +++ b/tests/intel/kms_joiner_helper.h
> @@ -20,6 +20,7 @@ bool igt_assign_pipes_for_outputs(int drm_fd,
>   				  uint32_t valid_pipes_mask);
>   bool intel_max_hdisplay_non_joiner_mode_found(int drm_fd, drmModeConnector *connector,
>   					      int max_dotclock, drmModeModeInfo *mode);
> +bool intel_mode_needs_joiner(int drm_fd, drmModeModeInfo *mode);
>   bool igt_is_joiner_supported_by_source(int drm_fd, enum joined_pipes joiner_type);
>   const char *igt_get_joined_pipes_name(enum joined_pipes val);
>