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

[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>
>
> Start weaning everyone off from poking inside display->pipes[]
> by hand. Introduce igt_crtc_for_pipe() as the preferred method
> for getting the correct crtc.
>
> Done by hand 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.h | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 6e7cf112b1e2..5bb5c2cac19c 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -578,6 +578,11 @@ 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);
>  
> +static inline igt_pipe_t *igt_crtc_for_pipe(igt_display_t *display, enum pipe pipe)
> +{
> +	return &display->pipes[pipe];
> +}
> +
>  const char *igt_output_name(igt_output_t *output);
>  drmModeModeInfo *igt_output_get_mode(igt_output_t *output);
>  drmModeModeInfo *igt_output_get_highres_mode(igt_output_t *output);
> @@ -726,7 +731,7 @@ static inline bool igt_output_is_connected(igt_output_t *output)
>   */
>  #define for_each_pipe(display, pipe) \
>  	for_each_pipe_static(pipe) \
> -		for_each_if((display)->pipes[(pipe)].valid)
> +		for_each_if(igt_crtc_for_pipe((display), (pipe))->valid)
>  
>  /**
>   * for_each_pipe_with_valid_output:
> @@ -745,7 +750,7 @@ static inline bool igt_output_is_connected(igt_output_t *output)
>  	for (int con__ = (pipe) = 0; \
>  	     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(igt_crtc_for_pipe((display), (pipe))->valid) \
>  			for_each_if ((((output) = &(display)->outputs[con__]), \
>  						igt_pipe_connector_valid((pipe), (output))))
>  
> @@ -793,8 +798,9 @@ igt_output_t **__igt_pipe_populate_outputs(igt_display_t *display,
>   * If there are no valid planes for this pipe, nothing happens.
>   */
>  #define for_each_plane_on_pipe(display, pipe, plane)			\
> -	for (int j__ = 0; assert(igt_can_fail()), (plane) = &(display)->pipes[(pipe)].planes[j__], \
> -		     j__ < (display)->pipes[(pipe)].n_planes; j__++)
> +	for (int j__ = 0; assert(igt_can_fail()), \
> +		     (plane) = &igt_crtc_for_pipe((display), (pipe))->planes[j__], \
> +		     j__ < igt_crtc_for_pipe((display), (pipe))->n_planes; j__++)
>  
>  /**
>   * for_each_connector_mode:

-- 
Jani Nikula, Intel