Re: [PATCH i-g-t v1 01/25] lib/igt_kms: Add a detect timeout value

[Jani Nikula <jani.nikula@intel.com>]

On Tue, 28 Apr 2026, Mohammed Bilal <mohammed.bilal@intel.com> wrote:
> From: Louis Chauvet <louis.chauvet@bootlin.com>
>
> Some tests need to wait for a specific connector status. In order to make
> the timeout customisable for each target, add an option in the
> configuration file.
>
> Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> ---
>  lib/igt_core.c |   4 ++
>  lib/igt_kms.c  | 123 +++++++++++++++++++++++++++++++------------------
>  lib/igt_kms.h  |  10 ++++
>  3 files changed, 92 insertions(+), 45 deletions(-)
>
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index 4f79c0294..cc835ea4c 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -271,6 +271,10 @@
>   *	&num; It is not mandatory and allows overriding default values.
>   *	[DUT]
>   *	SuspendResumeDelay=10
> + *
> + *	&num; The following option define the timeout for detection feature
> + *	&num; (waiting for a connector status)
> + *	DisplayDetectTimeout=10.0
>   * ]|
>   *
>   * Some specific configuration options may be used by specific parts of IGT,
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 38c28f45f..ece888d1a 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -60,6 +60,7 @@
>  #include "igt_debugfs.h"
>  #include "igt_device.h"
>  #include "igt_pipe_crc.h"
> +#include "igt_rc.h"
>  #include "igt_sysfs.h"
>  #include "sw_sync.h"
>  #ifdef HAVE_CHAMELIUM
> @@ -8066,38 +8067,38 @@ bool igt_has_lobf_debugfs(int drmfd, igt_output_t *output)
>  
>  igt_crtc_t *igt_crtc_for_crtc_id(igt_display_t *display, uint32_t crtc_id)
>  {
> -	igt_crtc_t *crtc;
> +        igt_crtc_t *crtc;
>  
> -	for_each_crtc(display, crtc) {
> -		if (crtc->crtc_id == crtc_id)
> -			return crtc;
> -	}
> +        for_each_crtc(display, crtc) {
> +                if (crtc->crtc_id == crtc_id)
> +                        return crtc;
> +        }
>  
> -	return NULL;
> +        return NULL;

Please check your patches before sending. There's a bunch of tabs to
spaces changes all over the place.

BR,
Jani.

>  }
>  
>  igt_crtc_t *igt_crtc_for_crtc_index(igt_display_t *display, int crtc_index)
>  {
> -	igt_crtc_t *crtc;
> +        igt_crtc_t *crtc;
>  
> -	for_each_crtc(display, crtc) {
> -		if (crtc->crtc_index == crtc_index)
> -			return crtc;
> -	}
> +        for_each_crtc(display, crtc) {
> +                if (crtc->crtc_index == crtc_index)
> +                        return crtc;
> +        }
>  
> -	return NULL;
> +        return NULL;
>  }
>  
>  igt_crtc_t *igt_crtc_for_pipe(igt_display_t *display, enum pipe pipe)
>  {
> -	igt_crtc_t *crtc;
> +        igt_crtc_t *crtc;
>  
> -	for_each_crtc(display, crtc) {
> -		if (crtc->pipe == pipe)
> -			return crtc;
> -	}
> +        for_each_crtc(display, crtc) {
> +                if (crtc->pipe == pipe)
> +                        return crtc;
> +        }
>  
> -	return NULL;
> +        return NULL;
>  }
>  
>  /*
> @@ -8108,14 +8109,14 @@ igt_crtc_t *igt_crtc_for_pipe(igt_display_t *display, enum pipe pipe)
>   */
>  igt_crtc_t *igt_first_crtc(igt_display_t *display)
>  {
> -	igt_crtc_t *crtc;
> +        igt_crtc_t *crtc;
>  
> -	for_each_crtc(display, crtc)
> -		return crtc;
> +        for_each_crtc(display, crtc)
> +                return crtc;
>  
> -	igt_skip("No CRTCs on device\n");
> +        igt_skip("No CRTCs on device\n");
>  
> -	return NULL;
> +        return NULL;
>  }
>  
>  /**
> @@ -8128,19 +8129,19 @@ igt_crtc_t *igt_first_crtc(igt_display_t *display)
>   */
>  igt_crtc_t *igt_first_crtc_with_single_output(igt_display_t *display, igt_output_t **ret_output)
>  {
> -	igt_output_t *output;
> -	igt_crtc_t *crtc;
> +        igt_output_t *output;
> +        igt_crtc_t *crtc;
>  
> -	for_each_crtc_with_single_output(display, crtc, output) {
> -		*ret_output = output;
> -		return crtc;
> -	}
> +        for_each_crtc_with_single_output(display, crtc, output) {
> +                *ret_output = output;
> +                return crtc;
> +        }
>  
> -	igt_skip("No valid CRTC/output combinations\n");
> +        igt_skip("No valid CRTC/output combinations\n");
>  
> -	*ret_output = NULL;
> +        *ret_output = NULL;
>  
> -	return NULL;
> +        return NULL;
>  }
>  
>  /*
> @@ -8152,14 +8153,14 @@ igt_crtc_t *igt_first_crtc_with_single_output(igt_display_t *display, igt_output
>   */
>  igt_crtc_t *igt_next_crtc(igt_display_t *display, igt_crtc_t *crtc)
>  {
> -	igt_crtc_t *next;
> +        igt_crtc_t *next;
>  
> -	for_each_crtc(display, next) {
> -		if (!crtc || next->pipe > crtc->pipe)
> -			return next;
> -	}
> +        for_each_crtc(display, next) {
> +                if (!crtc || next->pipe > crtc->pipe)
> +                        return next;
> +        }
>  
> -	return NULL;
> +        return NULL;
>  }
>  
>  /*
> @@ -8170,14 +8171,46 @@ igt_crtc_t *igt_next_crtc(igt_display_t *display, igt_crtc_t *crtc)
>   */
>  igt_crtc_t *igt_random_crtc(igt_display_t *display)
>  {
> -	igt_crtc_t *crtcs[IGT_MAX_PIPES];
> -	igt_crtc_t *crtc;
> -	int n = 0;
> +        igt_crtc_t *crtcs[IGT_MAX_PIPES];
> +        igt_crtc_t *crtc;
> +        int n = 0;
>  
> -	for_each_crtc(display, crtc)
> -		crtcs[n++] = crtc;
> +        for_each_crtc(display, crtc)
> +                crtcs[n++] = crtc;
> +
> +        igt_skip_on_f(!n, "No CRTCs on device\n");
> +
> +        return crtcs[rand() % n];
> +}
> +
> +/**
> + * igt_default_display_detect_timeout:
> + *
> + * Get the default timeout value for detection feature
> + *
> + * Some tests requires to wait for a specific connector status. This value will determine the
> + * timeout value for this waiting.
> + */
> +double igt_default_display_detect_timeout(void)
> +{
> +        static double timeout = 0.0;
> +        static bool first_call = true;
> +        GError *error = NULL;
> +
> +        if (first_call) {
> +                if (igt_key_file) {
> +                        timeout = g_key_file_get_double(igt_key_file, "DUT", "DisplayDetectTimeout",&error);
> +                        if (error) {
> +                                igt_debug("Failed to read DisplayDetectTimeout, defaulting to %f\n",DEFAULT_DETECT_TIMEOUT);
> +                                g_clear_error(&error);
> +                                timeout = DEFAULT_DETECT_TIMEOUT;
> +                        }
> +                } else {
> +                        timeout = DEFAULT_DETECT_TIMEOUT;
> +                }
>  
> -	igt_skip_on_f(!n, "No CRTCs on device\n");
> +                first_call = false;
> +        }
>  
> -	return crtcs[rand() % n];
> +        return timeout;
>  }
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index fcbb6a5ad..b10df1d8d 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -40,6 +40,14 @@
>  #include "igt_fb.h"
>  #include "ioctl_wrappers.h"
>  
> +/**
> + * define DEFAULT_DETECT_TIMEOUT - Default timeout in second used for some screen detection
> + * functions
> + *
> + * It can be overiden by option DetectTimeout in the .igtrc file.
> + */
> +#define DEFAULT_DETECT_TIMEOUT 10.0
> +
>  /* Low-level helpers with kmstest_ prefix */
>  
>  /**
> @@ -1289,4 +1297,6 @@ void igt_get_and_wait_out_fence(igt_output_t *output);
>  
>  igt_colorop_t *igt_find_colorop(igt_display_t *display, uint32_t id);
>  
> +double igt_default_display_detect_timeout(void);
> +
>  #endif /* __IGT_KMS_H__ */

-- 
Jani Nikula, Intel