[PATCH i-g-t 4/5] tests/intel/kms: Use lib helper to check the pipe/output combo validity

[B, Jeevan]

LGTM

Reviewed-by: Jeevan B <jeevan.b at intel.com>

> -----Original Message-----
> From: igt-dev <igt-dev-bounces at lists.freedesktop.org> On Behalf Of
> Bhanuprakash Modem
> Sent: Monday, April 8, 2024 11:42 AM
> To: igt-dev at lists.freedesktop.org
> Cc: Modem, Bhanuprakash <bhanuprakash.modem at intel.com>
> Subject: [PATCH i-g-t 4/5] tests/intel/kms: Use lib helper to check the
> pipe/output combo validity
> 
> Use IGT lib helper intel_pipe_output_combo_valid() to make sure the selected
> pipe/output/mode combo is valid.
> 
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
> ---
>  tests/intel/kms_pm_backlight.c |  7 ++++---
>  tests/intel/kms_psr.c          | 17 ++++++++++++-----
>  2 files changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/intel/kms_pm_backlight.c b/tests/intel/kms_pm_backlight.c
> index 2e691dab0..8672afa7a 100644
> --- a/tests/intel/kms_pm_backlight.c
> +++ b/tests/intel/kms_pm_backlight.c
> @@ -234,10 +234,11 @@ static void test_setup(igt_display_t display,
> igt_output_t *output)
>  	igt_display_reset(&display);
> 
>  	for_each_pipe(&display, pipe) {
> -		if (!igt_pipe_connector_valid(pipe, output))
> -			continue;
> -
>  		igt_output_set_pipe(output, pipe);
> +		if (!intel_pipe_output_combo_valid(&display)) {
> +			igt_output_set_pipe(output, PIPE_NONE);
> +			continue;
> +		}
>  		mode = igt_output_get_mode(output);
> 
>  		igt_create_pattern_fb(display.drm_fd,
> diff --git a/tests/intel/kms_psr.c b/tests/intel/kms_psr.c index
> c90612426..f3caa9ecc 100644
> --- a/tests/intel/kms_psr.c
> +++ b/tests/intel/kms_psr.c
> @@ -728,9 +728,14 @@ static enum pipe get_pipe_for_output(igt_display_t
> *display,
>  	enum pipe pipe;
> 
>  	for_each_pipe(display, pipe) {
> -		if (igt_pipe_connector_valid(pipe, output)) {
> -			return pipe;
> +		igt_output_set_pipe(output, pipe);
> +
> +		if (!intel_pipe_output_combo_valid(display)) {
> +			igt_output_set_pipe(output, PIPE_NONE);
> +			continue;
>  		}
> +
> +		return pipe;
>  	}
> 
>  	igt_assert_f(false, "No pipe found for output %s\n", @@ -750,9
> +755,6 @@ static void test_setup(data_t *data)
>  			      "Can't test FBC with PSR\n");
> 
>  	pipe = get_pipe_for_output(&data->display, data->output);
> -	igt_output_set_pipe(data->output, pipe);
> -	igt_require_f(intel_pipe_output_combo_valid(&data->display),
> -		      "output pipe combo not valid\n");
>  	data->crtc_id = data->output->config.crtc->crtc_id;
>  	connector = data->output->config.connector;
> 
> @@ -763,6 +765,11 @@ static void test_setup(data_t *data)
> 
>  		igt_output_override_mode(data->output, data->mode);
> 
> +		if (!intel_pipe_output_combo_valid(&data->display)) {
> +			igt_info("Skipping mode, not compatible with selected
> pipe/output\n");
> +			continue;
> +		}
> +
>  		psr_enable_if_enabled(data);
>  		setup_test_plane(data, data->test_plane_id);
>  		if (psr_wait_entry_if_enabled(data)) {
> --
> 2.43.2