Re: [PATCH i-g-t v8 3/6] tests/kms_flip: limit output pairs when testing suspend

Thasleem, Mohammed
2026-03-14T14:51:52Z

On 09-03-2026 02:55 pm, Michał Grzelak wrote:
> Currently 2x- subtests can still exceed timeout, even with limited
> number of pipes used. It can be seen when number of outputs is greater
> than 3.
>
> Default to testing at max 3 pairs of outputs. Add a commandline
> parameter enabling suspend testing on all possible output pairs. Add a
> LIMIT_PAIR macro which controls maximum number of output pairs to test.
>
> Signed-off-by: Michał Grzelak <michal.grzelak@intel.com>
LGTM:
Reviewed-by: Mohammed Thasleem <mohammed.thasleem@intel.com>
> ---
> tests/kms_flip.c | 32 ++++++++++++++++++++++++++------
> 1 file changed, 26 insertions(+), 6 deletions(-)
>
> diff --git a/tests/kms_flip.c b/tests/kms_flip.c
> index d09813f02..917c5ed6f 100755
> --- a/tests/kms_flip.c
> +++ b/tests/kms_flip.c
> @@ -263,11 +263,14 @@
> #define RUN_TEST 1
> #define RUN_PAIR 2
>
> +#define PAIR_LIMIT 3
> +
> #ifndef DRM_CAP_TIMESTAMP_MONOTONIC
> #define DRM_CAP_TIMESTAMP_MONOTONIC 6
> #endif
>
> static bool all_crtcs = false;
> +static bool all_pairs = false;
>
> drmModeRes *resources;
> int drm_fd;
> @@ -1904,6 +1907,7 @@ static void run_pair(int duration, int flags)
> {
> struct test_output o;
> int i, j, m, n, modes = 0;
> + int pair_count = 0;
>
> /* No tiling support in XE. */
> if (is_xe_device(drm_fd) && flags & TEST_FENCE_STRESS)
> @@ -1966,6 +1970,16 @@ static void run_pair(int duration, int flags)
> for (m = n + 1; m < resources->count_crtcs; m++) {
> int crtc_idxs[2];
>
> + /* Limit the execution to 2 CRTCs (first & last) for hang and suspend tests */
> + if (((flags & TEST_HANG) || (flags & TEST_SUSPEND)) && !all_crtcs &&
> + ((n != 0 && n != resources->count_crtcs) ||
> + m != resources->count_crtcs - 1))
> + continue;
> +
> + /* Limit number of suspend tests */
> + if ((flags & TEST_SUSPEND) && !all_pairs && pair_count >= PAIR_LIMIT)
> + continue;
> +
> memset(&o, 0, sizeof(o));
> o.count = 2;
> o._connector[0] = resources->connectors[i];
> @@ -1977,16 +1991,18 @@ static void run_pair(int duration, int flags)
> crtc_idxs[0] = n;
> crtc_idxs[1] = m;
>
> - /* Limit the execution to 2 CRTCs (first & last) for hang and suspend tests */
> - if (((flags & TEST_HANG) || (flags & TEST_SUSPEND)) && !all_crtcs &&
> - ((n != 0 && n != resources->count_crtcs) ||
> - m != resources->count_crtcs - 1))
> + connector_find_compatible_mode(n, m, &o);
> +
> + if (!o.mode_valid) {
> + free_test_output(&o);
> continue;
> + }
>
> run_test_on_crtc_set(&o, crtc_idxs,
> RUN_PAIR,
> resources->count_crtcs,
> duration);
> + pair_count++;
> }
> }
> }
> @@ -2044,6 +2060,9 @@ static int opt_handler(int opt, int opt_index, void *data)
> case 'e':
> all_crtcs = true;
> break;
> + case 'p':
> + all_pairs = true;
> + break;
> default:
> return IGT_OPT_HANDLER_ERROR;
> }
> @@ -2052,9 +2071,10 @@ static int opt_handler(int opt, int opt_index, void *data)
> }
>
> const char *help_str =
> - " -e \tRun on all CRTCs. (By default subtests will run on two CRTCs)\n";
> + " -e \tRun on all CRTCs. (By default subtests will run on two CRTCs)\n"
> + " -p \tRun on all output pairs. (By default 2x-* suspend subtests will run on 3 pairs)\n";
>
> -int igt_main_args("e", NULL, help_str, opt_handler, NULL)
> +int igt_main_args("ep", NULL, help_str, opt_handler, NULL)
> {
> struct {
> int duration;