From 1e057f43cd30ab6acfd40794673843942521c0c5 Mon Sep 17 00:00:00 2001 From: Nicholas Kazlauskas Date: Wed, 13 Mar 2019 16:12:19 -0400 Subject: tests/kms_plane: Set output to PIPE_NONE at end of test_format_plane MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AMDGPU rejects commits that have an active CRTC without an active primary plane. The pixel-format-pipe-* tests fail on AMDGPU during the cleanup at the end of the test due to the final commit disabling all the planes but not the CRTC. Disable the CRTC when cleaning up by setting the output to PIPE_NONE. Signed-off-by: Nicholas Kazlauskas Reviewed-by: Ville Syrjälä --- tests/kms_plane.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/kms_plane.c') diff --git a/tests/kms_plane.c b/tests/kms_plane.c index 9c330ae4..969a61c8 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -586,6 +586,7 @@ static bool test_format_plane(data_t *data, enum pipe pipe, igt_plane_set_fb(primary, NULL); igt_plane_set_fb(plane, NULL); + igt_output_set_pipe(output, PIPE_NONE); igt_display_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); igt_remove_fb(data->drm_fd, &fb); -- cgit v1.2.3