Re: [PATCH i-g-t v3 10/17] tests/kms_vblank: limit #outputs tested during suspend

["Thasleem, Mohammed" <mohammed.thasleem@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 3443 bytes --]


On 21-08-2026 06:18 pm, Michał Grzelak wrote:
> We are iterating through each output while testing suspend. This results
> in extended execution time. In turn this leads to hitting CI enforced
> timeout.
>
> By default limit number of tested outputs to 2. Test each connected
> output when passing command-line parameter.
>
> v1->v2
> - fix off-by-one error (Mohammed)
> - reset output_count before subtest (Mohammed)
>
> Signed-off-by: Michał Grzelak<michal.grzelak@intel.com>
> ---
>   tests/kms_vblank.c | 23 +++++++++++++++++++++--
>   1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
> index 47b733af15..7995528c3f 100644
> --- a/tests/kms_vblank.c
> +++ b/tests/kms_vblank.c
> @@ -109,7 +109,10 @@ typedef struct {
>   #define RPM	0x80
>   } data_t;
>   
> +#define OUTPUT_LIMIT 2
> +
>   static bool all_pipes;
> +static bool all_outputs;
>   static int active_crtcs[IGT_MAX_PIPES];
>   static uint32_t last_crtc_index;
>   
> @@ -476,6 +479,7 @@ static void vblank_ts_cont(data_t *data, int fd, int nchildren)
>   static void run_subtests(data_t *data)
>   {
>   	igt_crtc_t *crtc;
> +	int output_count = 0;
>   	const struct {
>   		const char *name;
>   		void (*func)(data_t *, int, int);
> @@ -513,9 +517,16 @@ static void run_subtests(data_t *data)
>   			if (m->flags & ~(f->valid | NOHANG))
>   				continue;
>   
> +			output_count = 0;
-->IMO: above line ^ not needed here
> +
>   			igt_describe("Check if test run while hanging by introducing NOHANG flag.");
>   			igt_subtest_with_dynamic_f("%s-%s", f->name, m->name) {
-->IMO: It make sense to add  --->output_count = 0 here.. please check it..
>   				for_each_connected_output(&data->display, data->output) {
> +					if (!all_outputs && (m->flags & SUSPEND) && output_count >= OUTPUT_LIMIT) {
> +						igt_info("Skipping output %s\n", data->output->name);
> +						continue;
> +					}
> +
>   					for_each_crtc(&data->display, crtc) {
>   						if(!igt_crtc_connector_valid(crtc, data->output))
>   							continue;
> @@ -538,6 +549,8 @@ static void run_subtests(data_t *data)
>   							run_test(data, f->func);
>   						}
>   					}
> +
> +					output_count++;
>   				}
>   			}
>   
> @@ -545,6 +558,8 @@ static void run_subtests(data_t *data)
>   			if (f->valid & NOHANG || m->flags & NOHANG)
>   				continue;
>   
> +			output_count = 0;
-->Here also not needed, above line ^
> +
>   			igt_describe("Check if injected hang is working properly.");
>   			igt_subtest_with_dynamic_f("%s-%s-hang", f->name, m->name) {
>   				igt_hang_t hang;
> @@ -628,6 +643,9 @@ static int opt_handler(int opt, int opt_index, void *data)
>   		case 'e':
>   			all_pipes = true;
>   			break;
> +		case 'o':
> +			all_outputs = true;
> +			break;
>   		default:
>   			return IGT_OPT_HANDLER_ERROR;
>   	}
> @@ -636,9 +654,10 @@ static int opt_handler(int opt, int opt_index, void *data)
>   }
>   
>   const char *help_str =
> -	"  -e \tRun on all pipes. (By default subtests will run on two pipes)\n";
> +	"  -e \tRun on all pipes. (By default subtests will run on two pipes)\n"
> +	"  -o \tRun on all outputs. (By default subtests will run on three outputs)\n";
-->OUTPUT_LIMIT is 2 so  should say "two outputs", not "three", check 
this...
>   
> -int igt_main_args("e", NULL, help_str, opt_handler, NULL)
> +int igt_main_args("eo", NULL, help_str, opt_handler, NULL)
>   {
>   	igt_crtc_t *crtc;
>   	int fd;

[-- Attachment #2: Type: text/html, Size: 4585 bytes --]