Re: [PATCH i-g-t v2 10/23] tests/intel/kms_frontbuffer_tracking: Use igt_crtc_t instead of enum pipe

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

On Sat, 21 Feb 2026, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Convert kms_frontbuffer_tracking from 'enum pipe' to 'igt_crtc_t'.
> This is written in its own peculiar style, and getting cocci to
> grog it seems very hard, so the conversion was done manually.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

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

> ---
>  tests/intel/kms_frontbuffer_tracking.c | 99 ++++++++++++--------------
>  1 file changed, 46 insertions(+), 53 deletions(-)
>
> diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
> index 58bc92a39422..ce0a646d4e80 100644
> --- a/tests/intel/kms_frontbuffer_tracking.c
> +++ b/tests/intel/kms_frontbuffer_tracking.c
> @@ -1020,7 +1020,7 @@ struct {
>  };
>  
>  struct modeset_params {
> -	enum pipe pipe;
> +	igt_crtc_t *crtc;
>  	igt_output_t *output;
>  	drmModeModeInfo mode;
>  
> @@ -1104,7 +1104,7 @@ static drmModeModeInfo *connector_get_mode(igt_output_t *output)
>  }
>  
>  static void init_mode_params(struct modeset_params *params,
> -			     igt_output_t *output, enum pipe pipe)
> +			     igt_output_t *output, igt_crtc_t *crtc)
>  {
>  	int i;
>  	drmModeModeInfo *mode;
> @@ -1112,11 +1112,11 @@ static void init_mode_params(struct modeset_params *params,
>  	igt_output_override_mode(output, NULL);
>  	mode = connector_get_mode(output);
>  
> -	params->pipe = pipe;
> +	params->crtc = crtc;
>  	params->output = output;
>  	params->mode = *mode;
>  
> -	params->primary.plane = igt_crtc_get_plane_type(igt_crtc_for_pipe(&drm.display, pipe),
> +	params->primary.plane = igt_crtc_get_plane_type(crtc,
>  							DRM_PLANE_TYPE_PRIMARY);
>  	params->primary.fb = NULL;
>  	params->primary.x = 0;
> @@ -1124,7 +1124,7 @@ static void init_mode_params(struct modeset_params *params,
>  	params->primary.w = mode->hdisplay;
>  	params->primary.h = mode->vdisplay;
>  
> -	params->cursor.plane = igt_crtc_get_plane_type(igt_crtc_for_pipe(&drm.display, pipe),
> +	params->cursor.plane = igt_crtc_get_plane_type(crtc,
>  						       DRM_PLANE_TYPE_CURSOR);
>  	params->cursor.fb = NULL;
>  	params->cursor.x = 0;
> @@ -1132,7 +1132,7 @@ static void init_mode_params(struct modeset_params *params,
>  	params->cursor.w = 64;
>  	params->cursor.h = 64;
>  
> -	params->sprite.plane = igt_crtc_get_plane_type(igt_crtc_for_pipe(&drm.display, pipe),
> +	params->sprite.plane = igt_crtc_get_plane_type(crtc,
>  						       DRM_PLANE_TYPE_OVERLAY);
>  	igt_require(params->sprite.plane);
>  	params->sprite.fb = NULL;
> @@ -1158,9 +1158,9 @@ static void init_mode_params(struct modeset_params *params,
>  
>  static bool find_connector(bool edp_only, bool pipe_a,
>  			   igt_output_t *forbidden_output,
> -			   enum pipe forbidden_pipe,
> +			   igt_crtc_t *forbidden_crtc,
>  			   igt_output_t **ret_output,
> -			   enum pipe *ret_pipe)
> +			   igt_crtc_t **ret_crtc)
>  {
>  	igt_output_t *output;
>  	igt_crtc_t *crtc;
> @@ -1174,7 +1174,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
>  		if (pipe_a && crtc->pipe != PIPE_A)
>  			continue;
>  
> -		if (output == forbidden_output || crtc->pipe == forbidden_pipe) {
> +		if (output == forbidden_output || crtc == forbidden_crtc) {
>  			igt_output_set_crtc(output,
>  					    crtc);
>  			igt_output_override_mode(output, connector_get_mode(output));
> @@ -1190,7 +1190,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
>  		igt_output_override_mode(output, connector_get_mode(output));
>  		if (intel_pipe_output_combo_valid(&drm.display)) {
>  			*ret_output = output;
> -			*ret_pipe = crtc->pipe;
> +			*ret_crtc = crtc;
>  			return true;
>  		}
>  	}
> @@ -1201,7 +1201,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
>  static bool init_modeset_cached_params(void)
>  {
>  	igt_output_t *prim_output = NULL, *scnd_output = NULL;
> -	enum pipe prim_pipe, scnd_pipe;
> +	igt_crtc_t *prim_crtc, *scnd_crtc;
>  
>  	/*
>  	 * We have this problem where PSR is only present on eDP monitors and
> @@ -1211,29 +1211,29 @@ static bool init_modeset_cached_params(void)
>  	 * TODO: refactor the code in a way that allows us to have different
>  	 * sets of prim/scnd structs for different features.
>  	 */
> -	find_connector(true, true, NULL, PIPE_NONE, &prim_output, &prim_pipe);
> +	find_connector(true, true, NULL, NULL, &prim_output, &prim_crtc);
>  	if (!prim_output)
> -		find_connector(true, false, NULL, PIPE_NONE, &prim_output, &prim_pipe);
> +		find_connector(true, false, NULL, NULL, &prim_output, &prim_crtc);
>  	if (!prim_output)
> -		find_connector(false, true, NULL, PIPE_NONE, &prim_output, &prim_pipe);
> +		find_connector(false, true, NULL, NULL, &prim_output, &prim_crtc);
>  	if (!prim_output)
> -		find_connector(false, false, NULL, PIPE_NONE, &prim_output, &prim_pipe);
> +		find_connector(false, false, NULL, NULL, &prim_output, &prim_crtc);
>  
>  	if (!prim_output)
>  		return false;
>  
> -	find_connector(false, false, prim_output, prim_pipe,
> -		       &scnd_output, &scnd_pipe);
> +	find_connector(false, false, prim_output, prim_crtc,
> +		       &scnd_output, &scnd_crtc);
>  
> -	init_mode_params(&prim_mode_params, prim_output, prim_pipe);
> +	init_mode_params(&prim_mode_params, prim_output, prim_crtc);
>  
>  	if (!scnd_output) {
> -		scnd_mode_params.pipe = PIPE_NONE;
> +		scnd_mode_params.crtc = NULL;
>  		scnd_mode_params.output = NULL;
>  		return true;
>  	}
>  
> -	init_mode_params(&scnd_mode_params, scnd_output, scnd_pipe);
> +	init_mode_params(&scnd_mode_params, scnd_output, scnd_crtc);
>  	return true;
>  }
>  
> @@ -1520,8 +1520,7 @@ static void __set_prim_plane_for_params(struct modeset_params *params)
>  static void __set_mode_for_params(struct modeset_params *params)
>  {
>  	igt_output_override_mode(params->output, &params->mode);
> -	igt_output_set_crtc(params->output,
> -			    igt_crtc_for_pipe(params->output->display, params->pipe));
> +	igt_output_set_crtc(params->output, params->crtc);
>  
>  	__set_prim_plane_for_params(params);
>  }
> @@ -1537,7 +1536,7 @@ static void __debugfs_read_crtc(const char *param, char *buf, int len)
>  	int dir;
>  	enum pipe pipe;
>  
> -	pipe = prim_mode_params.pipe;
> +	pipe = prim_mode_params.crtc->pipe;
>  	dir = igt_debugfs_crtc_dir(drm.fd, pipe, O_DIRECTORY);
>  	igt_require_fd(dir);
>  	igt_debugfs_simple_read(dir, param, buf, len);
> @@ -1686,12 +1685,12 @@ static bool fbc_psr_not_possible(void)
>  	return strstr(buf, "FBC disabled: PSR1 enabled (Wa_14016291713)");
>  }
>  
> -static bool fbc_enable_per_plane(int plane_index, enum pipe pipe)
> +static bool fbc_enable_per_plane(int plane_index, igt_crtc_t *crtc)
>  {
>  	char buf[PATH_MAX];
>  	char buf_plane[128];
>  
> -	sprintf(buf_plane, "%d%s", plane_index, kmstest_pipe_name(pipe));
> +	sprintf(buf_plane, "%d%s", plane_index, igt_crtc_name(crtc));
>  
>  	debugfs_read_crtc("i915_fbc_status", buf);
>  	return strstr(strstr(buf, "*"), buf_plane);
> @@ -1906,7 +1905,7 @@ static bool disable_features(const struct test_mode *t)
>  		return false;
>  
>  	intel_fbc_disable(drm.fd);
> -	intel_drrs_disable(drm.fd, prim_mode_params.pipe);
> +	intel_drrs_disable(drm.fd, prim_mode_params.crtc->pipe);
>  
>  	return psr.can_test ? psr_disable(drm.fd, drm.debugfs, NULL) : false;
>  }
> @@ -1980,14 +1979,13 @@ static void init_blue_crc(enum pixel_format format, enum tiling_type tiling)
>  
>  	fill_fb(&blue, COLOR_PRIM_BG);
>  
> -	igt_output_set_crtc(prim_mode_params.output,
> -			    igt_crtc_for_pipe(prim_mode_params.output->display, prim_mode_params.pipe));
> +	igt_output_set_crtc(prim_mode_params.output, prim_mode_params.crtc);
>  	igt_output_override_mode(prim_mode_params.output, &prim_mode_params.mode);
>  	igt_plane_set_fb(prim_mode_params.primary.plane, &blue);
>  	igt_display_commit(&drm.display);
>  
>  	if (!pipe_crc) {
> -		pipe_crc = igt_crtc_crc_new(igt_crtc_for_pipe(&drm.display, prim_mode_params.pipe),
> +		pipe_crc = igt_crtc_crc_new(prim_mode_params.crtc,
>  					    IGT_PIPE_CRC_SOURCE_AUTO);
>  		igt_assert(pipe_crc);
>  	}
> @@ -2036,8 +2034,7 @@ static void init_crcs(enum pixel_format format, enum tiling_type tiling,
>  					 IGT_DRAW_PWRITE : IGT_DRAW_BLT, r);
>  	}
>  
> -	igt_output_set_crtc(prim_mode_params.output,
> -			    igt_crtc_for_pipe(prim_mode_params.output->display, prim_mode_params.pipe));
> +	igt_output_set_crtc(prim_mode_params.output, prim_mode_params.crtc);
>  	igt_output_override_mode(prim_mode_params.output, &prim_mode_params.mode);
>  	for (r = 0; r < pattern->n_rects; r++) {
>  		igt_plane_set_fb(prim_mode_params.primary.plane, &tmp_fbs[r]);
> @@ -2155,7 +2152,7 @@ static void teardown_crcs(void)
>  
>  static void setup_fbc(void)
>  {
> -	if (!intel_fbc_supported_on_chipset(drm.fd, prim_mode_params.pipe)) {
> +	if (!intel_fbc_supported_on_chipset(drm.fd, prim_mode_params.crtc->pipe)) {
>  		igt_info("Can't test FBC: not supported on this chipset\n");
>  		return;
>  	}
> @@ -2195,7 +2192,7 @@ static void setup_drrs(void)
>  		return;
>  	}
>  
> -	if (!intel_is_drrs_supported(drm.fd, prim_mode_params.pipe)) {
> +	if (!intel_is_drrs_supported(drm.fd, prim_mode_params.crtc->pipe)) {
>  		igt_info("Can't test DRRS: Not supported.\n");
>  		return;
>  	}
> @@ -2352,7 +2349,7 @@ static void do_status_assertions(int flags)
>  			igt_assert_f(false, "DRRS LOW\n");
>  		}
>  	} else if (flags & ASSERT_DRRS_INACTIVE) {
> -		if (!intel_is_drrs_inactive(drm.fd, prim_mode_params.pipe)) {
> +		if (!intel_is_drrs_inactive(drm.fd, prim_mode_params.crtc->pipe)) {
>  			drrs_print_status();
>  			igt_assert_f(false, "DRRS INACTIVE\n");
>  		}
> @@ -2363,9 +2360,9 @@ static void do_status_assertions(int flags)
>  		igt_require(!fbc_stride_not_supported());
>  		igt_require(!fbc_mode_too_large());
>  		igt_require(!fbc_psr_not_possible());
> -		if (!intel_fbc_wait_until_enabled(drm.fd, prim_mode_params.pipe)) {
> +		if (!intel_fbc_wait_until_enabled(drm.fd, prim_mode_params.crtc->pipe)) {
>  			igt_assert_f(intel_fbc_is_enabled(drm.fd,
> -						    prim_mode_params.pipe,
> +						    prim_mode_params.crtc->pipe,
>  						    IGT_LOG_WARN),
>  				     "FBC disabled\n");
>  		}
> @@ -2374,7 +2371,7 @@ static void do_status_assertions(int flags)
>  			igt_assert(fbc_wait_for_compression());
>  	} else if (flags & ASSERT_FBC_DISABLED) {
>  		igt_assert(!intel_fbc_wait_until_enabled(drm.fd,
> -						   prim_mode_params.pipe));
> +						   prim_mode_params.crtc->pipe));
>  	}
>  
>  	if (flags & ASSERT_PSR_ENABLED) {
> @@ -2443,10 +2440,8 @@ static void update_modeset_cached_params(enum igt_draw_method method)
>  {
>  	bool found = false;
>  
> -	igt_output_set_crtc(prim_mode_params.output,
> -			    igt_crtc_for_pipe(prim_mode_params.output->display, prim_mode_params.pipe));
> -	igt_output_set_crtc(scnd_mode_params.output,
> -			    igt_crtc_for_pipe(scnd_mode_params.output->display, scnd_mode_params.pipe));
> +	igt_output_set_crtc(prim_mode_params.output, prim_mode_params.crtc);
> +	igt_output_set_crtc(scnd_mode_params.output, scnd_mode_params.crtc);
>  
>  	found = igt_override_all_active_output_modes_to_fit_bw(&drm.display);
>  	igt_require_f(found, "No valid mode combo found.\n");
> @@ -2514,7 +2509,7 @@ static void set_plane_for_test_fbc(const struct test_mode *t, igt_plane_t *plane
>  	struct igt_fb fb;
>  	uint64_t color;
>  
> -	igt_info("Testing fbc on plane %i%s\n", plane->index + 1, kmstest_pipe_name(prim_mode_params.pipe));
> +	igt_info("Testing fbc on plane %i%s\n", plane->index + 1, igt_crtc_name(prim_mode_params.crtc));
>  
>  	create_fb(t->format, prim_mode_params.mode.hdisplay, prim_mode_params.mode.vdisplay, t->tiling, t->plane, &fb);
>  	color = pick_color(&fb, COLOR_PRIM_BG);
> @@ -2530,7 +2525,7 @@ static void set_plane_for_test_fbc(const struct test_mode *t, igt_plane_t *plane
>  
>  	fbc_update_last_action();
>  	do_assertions(ASSERT_FBC_ENABLED | ASSERT_NO_ACTION_CHANGE);
> -	igt_assert_f(fbc_enable_per_plane(plane->index + 1, prim_mode_params.pipe), "FBC disabled\n");
> +	igt_assert_f(fbc_enable_per_plane(plane->index + 1, prim_mode_params.crtc), "FBC disabled\n");
>  
>  	igt_remove_fb(drm.fd, &fb);
>  	igt_plane_set_fb(plane, NULL);
> @@ -2549,7 +2544,7 @@ static bool enable_features_for_test(const struct test_mode *t)
>  	if (t->feature & FEATURE_PSR)
>  		ret = psr_enable(drm.fd, drm.debugfs, PSR_MODE_1, NULL);
>  	if (t->feature & FEATURE_DRRS)
> -		intel_drrs_enable(drm.fd, prim_mode_params.pipe);
> +		intel_drrs_enable(drm.fd, prim_mode_params.crtc->pipe);
>  
>  	return ret;
>  }
> @@ -2769,12 +2764,11 @@ static void plane_fbc_rte_subtest(const struct test_mode *t)
>  	do_assertions(ASSERT_FBC_DISABLED | DONT_ASSERT_CRC);
>  
>  	igt_output_override_mode(prim_mode_params.output, &prim_mode_params.mode);
> -	igt_output_set_crtc(prim_mode_params.output,
> -			    igt_crtc_for_pipe(prim_mode_params.output->display, prim_mode_params.pipe));
> +	igt_output_set_crtc(prim_mode_params.output, prim_mode_params.crtc);
>  
>  	wanted_crc = &blue_crcs[t->format].crc;
>  
> -	for_each_plane_on_pipe(&drm.display, prim_mode_params.pipe, plane) {
> +	for_each_plane_on_pipe(&drm.display, prim_mode_params.crtc->pipe, plane) {
>  		if (!is_valid_plane(plane))
>  			continue;
>  
> @@ -3164,8 +3158,7 @@ static void page_flip_for_params(struct modeset_params *params,
>  
>  	switch (type) {
>  	case FLIP_PAGEFLIP:
> -		rc = drmModePageFlip(drm.fd,
> -				     igt_crtc_for_pipe(&drm.display, params->pipe)->crtc_id,
> +		rc = drmModePageFlip(drm.fd, params->crtc->crtc_id,
>  				     params->primary.fb->fb_id,
>  				     DRM_MODE_PAGE_FLIP_EVENT, NULL);
>  		igt_assert_eq(rc, 0);
> @@ -3778,7 +3771,7 @@ static void stridechange_subtest(const struct test_mode *t)
>  	 * with the atomic page flip helper, but not with the legacy page flip.
>  	 */
>  	rc = drmModePageFlip(drm.fd,
> -			     igt_crtc_for_pipe(&drm.display, params->pipe)->crtc_id,
> +			     params->crtc->crtc_id,
>  			     new_fb->fb_id, 0, NULL);
>  	igt_assert(rc == -EINVAL || rc == 0);
>  	do_assertions(rc ? 0 : DONT_ASSERT_FBC_STATUS);
> @@ -4210,7 +4203,7 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL)
>  	igt_subtest_group() {
>  		igt_subtest_with_dynamic("pipe-fbc-rte") {
>  
> -			enum pipe default_pipe = prim_mode_params.pipe;
> +			igt_crtc_t *default_crtc = prim_mode_params.crtc;
>  
>  			t.pipes = PIPE_SINGLE;
>  			t.feature = FEATURE_FBC;
> @@ -4226,7 +4219,7 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL)
>  				      "FBC isn't supported on BMG\n");
>  
>  			for_each_crtc(&drm.display, crtc) {
> -				if (crtc->pipe == default_pipe) {
> +				if (crtc == default_crtc) {
>  					igt_info("pipe-%s: FBC validated in other subtest\n", igt_crtc_name(crtc));
>  					continue;
>  				}
> @@ -4240,7 +4233,7 @@ int igt_main_args("", long_options, help_str, opt_handler, NULL)
>  				setup_crcs();
>  
>  				for_each_valid_output_on_pipe(&drm.display, crtc->pipe, output) {
> -					init_mode_params(&prim_mode_params, output, crtc->pipe);
> +					init_mode_params(&prim_mode_params, output, crtc);
>  					setup_fbc();
>  
>  					igt_dynamic_f("pipe-%s-%s", igt_crtc_name(crtc),

-- 
Jani Nikula, Intel