Re: [PATCH i-g-t 08/15] lib/kms: Use for_each_crtc_with_single_output(), part 1

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

On Fri, 30 Jan 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Convert some uses of for_each_pipe_with_single_output()
> to for_each_crtc_with_single_output(). Take care of the
> cases where we (presumably) still have to keep some
> kind of 'data.pipe' thingy still up to date.
>
> Eventually we should probably replace 'data.pipe' with
> 'data.crtc' but I didn't want to go that far here.
>
> Done with cocci:
>  #include "scripts/iterators.cocci"
>
> @change@
> iterator name for_each_pipe_with_single_output;
> iterator name for_each_crtc_with_single_output;
> typedef igt_crtc_t;
> identifier PIPE;
> expression DISPLAY, OUTPUT, X;
> @@
> - for_each_pipe_with_single_output(DISPLAY, X.PIPE, OUTPUT)
> + for_each_crtc_with_single_output(DISPLAY, crtc, OUTPUT)
> {
> + X.PIPE = crtc->pipe;
> <...
> (
> - igt_crtc_for_pipe(..., X.PIPE)
> + crtc
> |
> - kmstest_pipe_name(X.PIPE)
> + igt_crtc_name(crtc)
> |
> - X.PIPE
> + crtc->pipe
> )
> ...>
> }
>
> @depends on change@
> identifier FUNC;
> @@
> FUNC(...)
> {
> + igt_crtc_t *crtc;
> <+...
> for_each_crtc_with_single_output(...) { ... }
> ...+>
> }
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

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

> ---
>  tests/kms_cursor_edge_walk.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> index eaf4c59b8a19..86577fbc53d8 100644
> --- a/tests/kms_cursor_edge_walk.c
> +++ b/tests/kms_cursor_edge_walk.c
> @@ -344,6 +344,7 @@ static const char *help_str =
>  
>  int igt_main_args("", long_opts, help_str, opt_handler, &data)
>  {
> +	igt_crtc_t *crtc;
>  	struct {
>  		const char *name;
>  		unsigned flags;
> @@ -394,21 +395,24 @@ int igt_main_args("", long_opts, help_str, opt_handler, &data)
>  					data.curw, data.curh, tests[i].name);
>  			igt_subtest_with_dynamic_f("%dx%d-%s", data.curw,
>  						   data.curh, tests[i].name) {
> -				for_each_pipe_with_single_output(&data.display, data.pipe, data.output) {
> -					if (!extended && data.pipe != active_pipes[0] &&
> -					    data.pipe != active_pipes[last_pipe])
> +				for_each_crtc_with_single_output(&data.display,
> +								 crtc,
> +								 data.output) {
> +					data.pipe = crtc->pipe;
> +					if (!extended && crtc->pipe != active_pipes[0] &&
> +					    crtc->pipe != active_pipes[last_pipe])
>  						continue;
>  
>  					igt_display_reset(&data.display);
>  					igt_output_set_crtc(data.output,
> -							    igt_crtc_for_pipe(data.output->display, data.pipe));
> +							    crtc);
>  					if (!intel_pipe_output_combo_valid(&data.display))
>  						continue;
>  
>  					igt_output_set_crtc(data.output, NULL);
>  
>  					igt_dynamic_f("pipe-%s-%s",
> -						      kmstest_pipe_name(data.pipe),
> +						      igt_crtc_name(crtc),
>  						      data.output->name)
>  						test_crtc(&data, tests[i].flags);
>  				}

-- 
Jani Nikula, Intel