Re: [PATCH i-g-t, v6 2/4] tests/kms_joiner_helper: Add igt_is_joiner_supported_by_source()

[Karthik B S <karthik.b.s@intel.com>]

Hi Swati,

On 5/1/2026 12:39 AM, Swati Sharma wrote:
> Add func() returning true/false if platform supports big/ultra
> joiner and use corresponding func() in related binaries.
>
> v2: -Moved func() to joiner_helper (Jeevan)
>      -Use common func for ultra|big joiner (Ankit)
> v3: -Rename param type to joiner_type (Ankit)
>      -Fix ultra joiner condition logic (Karthik, Ankit)
>
> Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
> ---
>   tests/intel/kms_joiner.c        |  8 ++------
>   tests/intel/kms_joiner_helper.c | 33 +++++++++++++++++++++++++++++++++
>   tests/intel/kms_joiner_helper.h |  2 ++
>   3 files changed, 37 insertions(+), 6 deletions(-)
>
> diff --git a/tests/intel/kms_joiner.c b/tests/intel/kms_joiner.c
> index 86226a3ba..2cd0d7276 100644
> --- a/tests/intel/kms_joiner.c
> +++ b/tests/intel/kms_joiner.c
> @@ -33,7 +33,6 @@
>    */
>   
>   #include "igt.h"
> -#include "xe/xe_query.h"
>   #include "kms_dsc_helper.c"
>   #include "kms_joiner_helper.h"
>   
> @@ -619,9 +618,8 @@ static void test_basic_max_non_joiner(data_t *data)
>   
>   int igt_main()
>   {
> -	bool is_dgfx;
>   	igt_crtc_t *crtc;
> -	int j, display_ver;
> +	int j;
>   	igt_output_t *output;
>   	drmModeModeInfo mode;
>   	data_t data;
> @@ -644,9 +642,7 @@ int igt_main()
>   		igt_require(data.display.is_atomic);
>   		max_dotclock = igt_get_max_dotclock(data.drm_fd);
>   
> -		is_dgfx = is_xe_device(data.drm_fd) ? xe_has_vram(data.drm_fd) : gem_has_lmem(data.drm_fd);
> -		display_ver = intel_display_ver(intel_get_drm_devid(data.drm_fd));
> -		if (is_dgfx && display_ver == 14)
> +		if (igt_is_joiner_supported_by_source(data.drm_fd, JOINED_PIPES_ULTRA_JOINER))

Would be to add a check using this helper for big joiner as well, but 
that could be handled outside this patch as well.

>   			data.ultra_joiner_supported = true;
>   
>   		for_each_connected_output(&data.display, output) {
> diff --git a/tests/intel/kms_joiner_helper.c b/tests/intel/kms_joiner_helper.c
> index 0aa409ac2..d51aa77e5 100644
> --- a/tests/intel/kms_joiner_helper.c
> +++ b/tests/intel/kms_joiner_helper.c
> @@ -184,6 +184,39 @@ bool igt_assign_pipes_for_outputs(int drm_fd,
>   	return true;
>   }
>   
> +/**
> + * igt_is_joiner_supported_by_source:
> + * @drm_fd: drm file descriptor
> + * @joiner_type: joiner type
> + *
> + * Returns: True if (ultra|big)joiner is supported by platform, false otherwise
> + */
> +bool igt_is_joiner_supported_by_source(int drm_fd, enum joined_pipes joiner_type)

IMHO, the function also be called igt_is_joiner_type_supported_by_source?

Either case, patch LGTM.

Reviewed-by: Karthik B S <karthik.b.s@intel.com>

> +{
> +	int disp_ver;
> +	bool is_dgfx;
> +
> +	is_dgfx = is_xe_device(drm_fd) ? xe_has_vram(drm_fd) : gem_has_lmem(drm_fd);
> +	disp_ver = intel_display_ver(intel_get_drm_devid(drm_fd));
> +
> +	switch (joiner_type) {
> +	case JOINED_PIPES_BIG_JOINER:
> +		if (disp_ver < 12) {
> +			igt_info("Bigjoiner is not supported on D11 and older platforms.\n");
> +			return false;
> +		}
> +		return true;
> +	case JOINED_PIPES_ULTRA_JOINER:
> +		if (!is_dgfx || disp_ver != 14) {
> +			igt_info("Ultrajoiner is supported on dgfx with D14 only.\n");
> +			return false;
> +		}
> +		return true;
> +	default:
> +		return false;
> +	}
> +}
> +
>   /**
>    * igt_get_joined_pipes_name:
>    * @val: joined_pipes enum value
> diff --git a/tests/intel/kms_joiner_helper.h b/tests/intel/kms_joiner_helper.h
> index 1ea871a3b..7ede624c6 100644
> --- a/tests/intel/kms_joiner_helper.h
> +++ b/tests/intel/kms_joiner_helper.h
> @@ -7,6 +7,7 @@
>   #define KMS_JOINER_HELPER_H
>   
>   #include "igt_kms.h"
> +#include "xe/xe_query.h"
>   
>   void igt_set_all_master_pipes_for_platform(igt_display_t *display,
>   					   uint32_t *master_pipes);
> @@ -17,6 +18,7 @@ bool igt_assign_pipes_for_outputs(int drm_fd,
>   				  uint32_t *used_pipes_mask,
>   				  uint32_t master_pipes_mask,
>   				  uint32_t valid_pipes_mask);
> +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);
>   
>   enum force_joiner_mode {