[igt-dev] [PATCH i-g-t v9] kms_atomic_transition:Convert nx-modeset-transitions subtest to dynamic

[Petri Latvala]

On Wed, Dec 16, 2020 at 12:12:27PM +0530, Nidhi Gupta wrote:
> In kms_atomic_transition subtest,it will test all the
> pipes defined in IGT, i.e. IGT_MAX_PIPES whether
> the output is available or not.Later it has to be
> analysed and discarded as valid skip.To save this
> time, updated the test to first check the available
> outputs and then execute the test.
> 
> V7: -Modified commit message. (Karthik)
>     -Replaced for_each_single_pipe_with_single__output with
>      for_each_connected_output to execute the test only on
>      connected display. (Karthik)
> 
> v8: -Modified the description subject line. (Petri)
>     -Modified subtests names to remove redundancy. (Petri)
>     -Added extra line before for loop. (Karthik)
> 
> v9: -Made separate subtests for non-blocking and
>      fencing parameters. (Petri)
> 
> Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
> Reviewed-by: Karthik B S <karthik.b.s at intel.com>
> ---
>  tests/kms_atomic_transition.c | 37 +++++++++++++++++++++++++----------
>  1 file changed, 27 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index a71bbe10..ae063d43 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -918,7 +918,7 @@ igt_main
>  	igt_display_t display;
>  	igt_output_t *output;
>  	enum pipe pipe;
> -	int i;
> +	int i, count = 0;
>  
>  	igt_fixture {
>  		display.drm_fd = drm_open_driver_master(DRIVER_ANY);
> @@ -929,6 +929,9 @@ igt_main
>  		igt_require(display.is_atomic);
>  
>  		igt_display_require_output(&display);
> +
> +		for_each_connected_output(&display, output)
> +			count++;
>  	}
>  
>  	igt_subtest("plane-primary-toggle-with-vblank-wait")
> @@ -1024,18 +1027,32 @@ igt_main
>  		for_each_pipe_with_valid_output(&display, pipe, output)
>  			run_transition_test(&display, pipe, output, TRANSITION_MODESET_DISABLE, false, false);
>  
> -	for (i = 1; i <= IGT_MAX_PIPES; i++) {
> -		igt_subtest_f("%ix-modeset-transitions", i)
> -			run_modeset_transition(&display, i, false, false);
> +	igt_subtest_with_dynamic("modeset-transition") {
> +		for (i = 1; i <= count; i++) {
> +			igt_dynamic_f("%ix-outputs", i)
> +				run_modeset_transition(&display, i, false, false);
> +		}
> +	}
>  
> -		igt_subtest_f("%ix-modeset-transitions-nonblocking", i)
> -			run_modeset_transition(&display, i, true, false);
> +	igt_subtest_with_dynamic("modeset-transition-nonblocking") {
> +		for (i = 1; i <= count; i++) {
> +			igt_dynamic_f("%ix-outputs-nonblocking", i)
> +				run_modeset_transition(&display, i, true, false);
> +		}
> +	}
>  
> -		igt_subtest_f("%ix-modeset-transitions-fencing", i)
> -			run_modeset_transition(&display, i, false, true);
> +	igt_subtest_with_dynamic("modeset-transition-fencing") {
> +		for (i = 1; i <= count; i++) {
> +			igt_dynamic_f("%ix-outputs-fencing", i)
> +				run_modeset_transition(&display, i, false, true);
> +		}
> +	}
>  
> -		igt_subtest_f("%ix-modeset-transitions-nonblocking-fencing", i)
> -			run_modeset_transition(&display, i, true, true);
> +	igt_subtest_with_dynamic("modeset-transition-nonblocking-fencing") {
> +		for (i = 1; i <= count; i++) {
> +			igt_dynamic_f("%ix-outputs-nonblocking-fencing", i)
> +				run_modeset_transition(&display, i, true, true);
> +		}


The dynamic subtest name can be just "%ix-outputs" for all of these. Otherwise LGTM,
Reviewed-by: Petri Latvala <petri.latvala at intel.com>

I'll change that when merging.