[igt-dev] [PATCH i-g-t 2/2] tests/kms : Added dynamic test cases

[Modem, Bhanuprakash]

On Tue-19-04-2022 01:03 pm, Nidhi Gupta wrote:
> Modified kms_sequence and kms_concurrent to include
> dynamic test cases.
> 
> Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
> ---
>   tests/kms_concurrent.c |  6 ++--
>   tests/kms_sequence.c   | 81 ++++++++++++++++++++++--------------------
>   2 files changed, 47 insertions(+), 40 deletions(-)
> 
> diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
> index 622d3335..82b2021e 100644
> --- a/tests/kms_concurrent.c
> +++ b/tests/kms_concurrent.c
> @@ -328,9 +328,11 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
>   
>   	igt_describe("Test atomic mode setting concurrently with multiple planes and screen "
>   		     "resolution.");
> -	igt_subtest_f("pipe-%s", kmstest_pipe_name(pipe))
> +	igt_subtest_with_dynamic_f("pipe-%s", kmstest_pipe_name(pipe)) {
>   		for_each_valid_output_on_pipe(&data->display, pipe, output)
> -			run_test(data, pipe, output);
> +			igt_dynamic_f("%s", igt_output_name(output))
> +				run_test(data, pipe, output);
> +	}
>   }
>   
>   static int opt_handler(int option, int option_index, void *input)
> diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
> index ca25e041..593373b9 100644
> --- a/tests/kms_sequence.c
> +++ b/tests/kms_sequence.c
> @@ -140,53 +140,49 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int))
>   {
>   	int nchildren =
>   		data->flags & FORKED ? sysconf(_SC_NPROCESSORS_ONLN) : 1;
> -	igt_display_t *display = &data->display;
>   	igt_output_t *output;
> -	enum pipe p;
>   	unsigned int valid_tests = 0;
> +	output = data->output;
>   
> -	for_each_pipe_with_valid_output(display, p, output) {
> -		data->pipe = p;
> -		prepare_crtc(data, fd, output);
> +	prepare_crtc(data, fd, output);
>   
> -		igt_info("Beginning %s on pipe %s, connector %s (%d threads)\n",
> -			 igt_subtest_name(),
> -			 kmstest_pipe_name(data->pipe),
> -			 igt_output_name(output),
> -			 nchildren);
> +	igt_info("Beginning %s on pipe %s, connector %s (%d threads)\n",
> +		 igt_subtest_name(),
> +		 kmstest_pipe_name(data->pipe),
> +		 igt_output_name(output),
> +		 nchildren);
>   
> -		if (data->flags & BUSY) {
> -			struct drm_crtc_queue_sequence cqs;
> +	if (data->flags & BUSY) {
> +		struct drm_crtc_queue_sequence cqs;
>   
> -			memset(&cqs, 0, sizeof(cqs));
> -			cqs.crtc_id = data->crtc_id;
> -			cqs.flags = DRM_CRTC_SEQUENCE_RELATIVE;
> -			cqs.sequence = 120 + 12;
> -			igt_assert_eq(crtc_queue_sequence(fd, &cqs), 0);
> -		}
> +		memset(&cqs, 0, sizeof(cqs));
> +		cqs.crtc_id = data->crtc_id;
> +		cqs.flags = DRM_CRTC_SEQUENCE_RELATIVE;
> +		cqs.sequence = 120 + 12;
> +		igt_assert_eq(crtc_queue_sequence(fd, &cqs), 0);
> +	}
>   
> -		igt_fork(child, nchildren)
> -			testfunc(data, fd, nchildren);
> -		igt_waitchildren();
> +	igt_fork(child, nchildren)
> +	testfunc(data, fd, nchildren);
> +	igt_waitchildren();
>   
> -		if (data->flags & BUSY) {
> -			struct drm_event_vblank buf;
> -			igt_assert_eq(read(fd, &buf, sizeof(buf)), sizeof(buf));
> -		}
> +	if (data->flags & BUSY) {
> +	struct drm_event_vblank buf;
> +	igt_assert_eq(read(fd, &buf, sizeof(buf)), sizeof(buf));
> +	}

Please fix these:
WARNING: suspect code indent for conditional statements (8, 8)
#232: FILE: tests/kms_sequence.c:169:
+       if (data->flags & BUSY) {
+       struct drm_event_vblank buf;

WARNING: Missing a blank line after declarations
#234: FILE: tests/kms_sequence.c:171:
+       struct drm_event_vblank buf;
+       igt_assert_eq(read(fd, &buf, sizeof(buf)), sizeof(buf));

>   
> -		igt_assert(poll(&(struct pollfd){fd, POLLIN}, 1, 0) == 0);
> +	igt_assert(poll(&(struct pollfd){fd, POLLIN}, 1, 0) == 0);
>   
> -		igt_info("\n%s on pipe %s, connector %s: PASSED\n\n",
> -			 igt_subtest_name(),
> -			 kmstest_pipe_name(data->pipe),
> -			 igt_output_name(output));
> +	igt_info("\n%s on pipe %s, connector %s: PASSED\n\n",
> +		 igt_subtest_name(),
> +		 kmstest_pipe_name(data->pipe),
> +		 igt_output_name(output));
>   
> -		/* cleanup what prepare_crtc() has done */
> -		cleanup_crtc(data, fd, output);
> -		valid_tests++;
> -	}
> +	/* cleanup what prepare_crtc() has done */
> +	cleanup_crtc(data, fd, output);
> +	valid_tests++;
>   
> -	igt_require_f(valid_tests,
> +igt_require_f(valid_tests,
>   		      "no valid crtc/connector combinations found\n");

As we are using dynamic subtests, this valid_tests is no more required.

- Bhanu

>   }
>   
> @@ -255,6 +251,8 @@ static void sequence_queue(data_t *data, int fd, int nchildren)
>   igt_main
>   {
>   	int fd;
> +	igt_output_t *output;
> +	enum pipe p;
>   	data_t data;
>   	const struct {
>   		const char *name;
> @@ -280,6 +278,7 @@ igt_main
>   		fd = drm_open_driver_master(DRIVER_ANY);
>   		kmstest_set_vt_graphics_mode();
>   		igt_display_require(&data.display, fd);
> +		igt_display_require_output(&data.display);
>   	}
>   
>   	for (f = funcs; f->name; f++) {
> @@ -289,9 +288,15 @@ igt_main
>   
>   			igt_describe("This is a test of drmCrtcGetSequence and "
>   				     "drmCrtcQueueSequence");
> -			igt_subtest_f("%s-%s", f->name, m->name) {
> -				data.flags = m->flags;
> -				run_test(&data, fd, f->func);
> +			igt_subtest_with_dynamic_f("%s-%s", f->name, m->name) {
> +				for_each_pipe_with_valid_output(&data.display, p, output) {
> +					igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(p)) {
> +						data.pipe = p;
> +						data.output = output;
> +						data.flags = m->flags;
> +						run_test(&data, fd, f->func);
> +					}
> +				}
>   			}
>   		}
>   	}