From 8d4169d9543d8e5c01f0c746f603801a4d65ead0 Mon Sep 17 00:00:00 2001 From: Vidya Srinivas Date: Mon, 20 Sep 2021 13:47:02 +0530 Subject: tests/kms_concurrent: Fix regression in test_resolution_with_output Staring commit fea0e38e690c30c6 "Making the test more generic" test_resolution_with_output introduced setting igt_output_set_pipe to PIPE_NONE. This is triggering atomic check failure resulting in "enabled/connectors mismatch" under drm_atomic_helper_check_modeset. Patch fixes this issue. Signed-off-by: Vidya Srinivas Reviewed-by: Rodrigo Siqueira Tested-by: Rodrigo Siqueira --- tests/kms_concurrent.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c index 25c67eb4..47c441a5 100644 --- a/tests/kms_concurrent.c +++ b/tests/kms_concurrent.c @@ -268,7 +268,8 @@ test_resolution_with_output(data_t *data, enum pipe pipe, int max_planes, igt_ou /* switch to lower resolution */ igt_output_override_mode(output, mode_lo); - igt_output_set_pipe(output, PIPE_NONE); + if (is_amdgpu_device(data->drm_fd)) + igt_output_set_pipe(output, PIPE_NONE); igt_display_commit2(&data->display, COMMIT_ATOMIC); /* switch back to higher resolution */ -- cgit v1.2.3