Re: [PATCH i-g-t 02/10] lib/kms: Introduce igt_display_n_crtcs()

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

On Wed, 10 Dec 2025, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Introduce igt_display_n_crtcs() as the new name for
> igt_display_get_n_pipes(). The old name will get eliminated
> later using cocci, but it's easier to introduce duplicate
> names first because this needs to be used in a few messy macros
> that cocci doesn't like.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  lib/igt_kms.c | 13 ++++++++++++-
>  lib/igt_kms.h |  7 ++++---
>  2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 2d7da376bc0b..5b8598305f8c 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -3271,6 +3271,17 @@ out:
>  	}
>  }
>  
> +/**
> + * igt_display_n_crtcs:
> + * @display: A pointer to an #igt_display_t structure
> + *
> + * Returns: Total number of CRTCs for the given @display
> + */
> +int igt_display_n_crtcs(igt_display_t *display)
> +{
> +	return display->n_pipes;
> +}
> +
>  /**
>   * igt_display_get_n_pipes:
>   * @display: A pointer to an #igt_display_t structure
> @@ -3279,7 +3290,7 @@ out:
>   */
>  int igt_display_get_n_pipes(igt_display_t *display)
>  {
> -	return display->n_pipes;
> +	return igt_display_n_crtcs(display);
>  }
>  
>  /**
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 065cbeca09a8..4171e2baef61 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -577,6 +577,7 @@ int  igt_display_drop_events(igt_display_t *display);
>  int  igt_display_get_n_pipes(igt_display_t *display);
>  void igt_display_require_output(igt_display_t *display);
>  void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe);
> +int igt_display_n_crtcs(igt_display_t *display);
>  
>  const char *igt_output_name(igt_output_t *output);
>  drmModeModeInfo *igt_output_get_mode(igt_output_t *output);
> @@ -743,7 +744,7 @@ static inline bool igt_output_is_connected(igt_output_t *output)
>   */
>  #define for_each_pipe_with_valid_output(display, pipe, output) \
>  	for (int con__ = (pipe) = 0; \
> -	     assert(igt_can_fail()), (pipe) < igt_display_get_n_pipes((display)) && con__ < (display)->n_outputs; \
> +	     assert(igt_can_fail()), (pipe) < igt_display_n_crtcs(display) && con__ < (display)->n_outputs; \
>  	     con__ = (con__ + 1 < (display)->n_outputs) ? con__ + 1 : (pipe = pipe + 1, 0)) \
>  		 for_each_if((display)->pipes[pipe].valid) \
>  			for_each_if ((((output) = &(display)->outputs[con__]), \
> @@ -763,9 +764,9 @@ igt_output_t **__igt_pipe_populate_outputs(igt_display_t *display,
>   * be called at most once for each pipe.
>   */
>  #define for_each_pipe_with_single_output(display, pipe, output) \
> -	for (igt_output_t *__outputs[(display)->n_pipes], \
> +	for (igt_output_t *__outputs[igt_display_n_crtcs(display)], \
>  	     **__output = __igt_pipe_populate_outputs((display), __outputs); \
> -		 __output < &__outputs[(display)->n_pipes]; __output++) \
> +		 __output < &__outputs[igt_display_n_crtcs(display)]; __output++) \
>  		for_each_if (*__output && \
>  			     ((pipe) = (__output - __outputs), (output) = *__output, 1))

-- 
Jani Nikula, Intel