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

[Karthik B S]

On 6/21/2022 12:09 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.
>
> Signed-off-by: Jeevan B <jeevan.b at intel.com>
> ---
>   tests/kms_flip.c | 25 +++++++++++++++++++++++--
>   1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index c5b5741a..ccd37a7a 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -949,8 +949,8 @@ static void get_compatible_modes(drmModeModeInfo *a, drmModeModeInfo *b,
>   					return;
>   			}
>   		}
> -
> -		igt_skip("Compatible mode not found.\n");
> +		*a = c1->modes[0];
> +		*b = c2->modes[0];

Returning two modes which are actually not compatible_modes wouldn't be 
right as this function is being called from other parts of the test as 
well. Could we return a flag or something from this function based on 
whether or not a compatible mode is found and then take the decision to 
populate the combination accordingly?

Thanks,
Karthik.B.S
>   	}
>   
>   	return;
> @@ -1318,6 +1318,25 @@ static int sort_drm_modes(const void *a, const void *b)
>   	return (mode2->clock < mode1->clock) - (mode1->clock < mode2->clock);
>   }
>   
> +static void compatible_mode_check(struct test_output *o)
> +{
> +	drmModeModeInfo mode[2];
> +	int i;
> +
> +	for (i = 0; i < RUN_PAIR; i++) {
> +		qsort(o->kconnector[i]->modes,
> +		      o->kconnector[i]->count_modes,
> +		      sizeof(drmModeModeInfo),
> +		      sort_drm_modes);
> +	}
> +
> +	get_compatible_modes(&mode[0], &mode[1],
> +			     o->kconnector[0], o->kconnector[1]);
> +
> +	if (mode[0].hdisplay != mode[1].hdisplay && mode[0].vdisplay != mode[1].vdisplay)
> +		igt_skip("Compatible mode not found.\n");
> +}
> +
>   static void get_suitable_modes(struct test_output *o)
>   {
>   	drmModeModeInfo mode[2];
> @@ -1351,6 +1370,8 @@ static void __run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
>   	uint64_t modifier;
>   	int i, ret;
>   
> +	if (crtc_count == RUN_PAIR)
> +		compatible_mode_check(o);
>   restart:
>   	last_connector = o->kconnector[0];
>