[igt-dev] [PATCH i-g-t] tests/kms_Atomic_transition: Restrict execution to 2 pipes

[Karthik B S]

On 2/5/2021 3:33 PM, Nidhi Gupta wrote:
> To reduce the execution time, restricting the execution of the
> test to only 2 pipes

Hi,

Please add details regarding the bug we're seeing in multiple display 
set ups, because of which this change is required.

>
> Signed-off-by: Nidhi Gupta <nidhi1.gupta at intel.com>
> ---
>   tests/kms_atomic_transition.c | 25 +++++++++++++------------
>   1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index c3601ae9..de29f758 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -991,11 +991,12 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   		for_each_connected_output(&data.display, output)
>   			count++;
> +

Please remove this blank line.

With these minor changes, this patch looks good to me.

Reviewed-by: Karthik B S <karthik.b.s at intel.com>

Thanks,

Karthik.B.S

>   	}
>   
>   	igt_subtest("plane-primary-toggle-with-vblank-wait")
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			run_primary_test(&data, pipe, output);
> @@ -1004,7 +1005,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-transition") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1014,7 +1015,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-transition-fencing") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1024,7 +1025,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-transition-nonblocking") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1034,7 +1035,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-transition-nonblocking-fencing") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1044,7 +1045,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1054,7 +1055,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-use-after-nonblocking-unbind-fencing") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe))
> @@ -1069,7 +1070,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   	 */
>   	igt_subtest_with_dynamic("plane-all-modeset-transition")
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			if (output_is_internal_panel(output))
> @@ -1081,7 +1082,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-modeset-transition-fencing")
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			if (output_is_internal_panel(output))
> @@ -1093,7 +1094,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-modeset-transition-internal-panels") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			if (!output_is_internal_panel(output))
> @@ -1106,7 +1107,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest_with_dynamic("plane-all-modeset-transition-fencing-internal-panels") {
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			if (!output_is_internal_panel(output))
> @@ -1119,7 +1120,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>   
>   	igt_subtest("plane-toggle-modeset-transition")
>   		for_each_pipe_with_valid_output(&data.display, pipe, output) {
> -			if (pipe_count >= 2 && !data.extended)
> +			if (pipe_count == 2 * count && !data.extended)
>   				break;
>   			pipe_count++;
>   			run_transition_test(&data, pipe, output, TRANSITION_MODESET_DISABLE, false, false);