[igt-dev] [PATCH i-g-t v6] tests/kms_flip: Skip test only for invalid combination

[Karthik B S]

On 6/24/2022 4:28 PM, Jeevan B wrote:
> currently the entire test is skipping. adding this fix to skip test
> only for invalid cases and run on other valid display combination.
>
> v2: add RUN_PAIR check to avoid crash on single display.
> v3: add flag to check for valid display combination.(Karthik)
> v4: if no valid mode is found then flow should go to 'out'.(Karthik)
>
> Signed-off-by: Jeevan B <jeevan.b at intel.com>
Reviewed-by: Karthik B S <karthik.b.s at intel.com>
> ---
>   tests/kms_flip.c | 31 ++++++++++++++++---------------
>   1 file changed, 16 insertions(+), 15 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index c5b5741a..d4339449 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -932,7 +932,7 @@ static bool mode_compatible(const drmModeModeInfo *a, const drmModeModeInfo *b)
>   	return true;
>   }
>   
> -static void get_compatible_modes(drmModeModeInfo *a, drmModeModeInfo *b,
> +static bool get_compatible_modes(drmModeModeInfo *a, drmModeModeInfo *b,
>   				 drmModeConnector *c1, drmModeConnector *c2)
>   {
>   	int n, m;
> @@ -946,14 +946,13 @@ static void get_compatible_modes(drmModeModeInfo *a, drmModeModeInfo *b,
>   			for (m = 0; m < c2->count_modes; m++) {
>   				*b = c2->modes[m];
>   				if (mode_compatible(a, b))
> -					return;
> +					return true;
>   			}
>   		}
> -
> -		igt_skip("Compatible mode not found.\n");
> +		return false;
>   	}
>   
> -	return;
> +	return true;
>   }
>   
>   static void connector_find_compatible_mode(int crtc_idx0, int crtc_idx1,
> @@ -972,13 +971,12 @@ static void connector_find_compatible_mode(int crtc_idx0, int crtc_idx1,
>   		return;
>   	}
>   
> -	get_compatible_modes(&mode[0], &mode[1],
> -			     config[0].connector, config[1].connector);
> +	o->mode_valid = get_compatible_modes(&mode[0], &mode[1],
> +					     config[0].connector, config[1].connector);
>   
>   	o->pipe = config[0].pipe;
>   	o->fb_width = mode[0].hdisplay;
>   	o->fb_height = mode[0].vdisplay;
> -	o->mode_valid = 1;
>   
>   	o->kconnector[0] = config[0].connector;
>   	o->kencoder[0] = config[0].encoder;
> @@ -1330,8 +1328,8 @@ static void get_suitable_modes(struct test_output *o)
>   		      sort_drm_modes);
>   	}
>   
> -	get_compatible_modes(&mode[0], &mode[1],
> -			     o->kconnector[0], o->kconnector[1]);
> +	o->mode_valid = get_compatible_modes(&mode[0], &mode[1],
> +					     o->kconnector[0], o->kconnector[1]);
>   
>   	o->fb_width = mode[0].hdisplay;
>   	o->fb_height = mode[0].vdisplay;
> @@ -1415,13 +1413,16 @@ retry:
>   		}
>   
>   		get_suitable_modes(o);
> +		if (o->mode_valid) {
> +			igt_remove_fb(drm_fd, &o->fb_info[2]);
> +			igt_remove_fb(drm_fd, &o->fb_info[1]);
> +			igt_remove_fb(drm_fd, &o->fb_info[0]);
>   
> -		igt_remove_fb(drm_fd, &o->fb_info[2]);
> -		igt_remove_fb(drm_fd, &o->fb_info[1]);
> -		igt_remove_fb(drm_fd, &o->fb_info[0]);
> +			restart = true;
> +			goto restart;
> +		}
>   
> -		restart = true;
> -		goto restart;
> +		goto out;
>   	}
>   
>   	igt_assert(!ret);