diff options
| author | Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> | 2019-03-13 16:12:19 -0400 |
|---|---|---|
| committer | Harry Wentland <harry.wentland@amd.com> | 2019-03-14 10:03:35 -0400 |
| commit | 1e057f43cd30ab6acfd40794673843942521c0c5 (patch) | |
| tree | e0a7e91b44f3846d11440afd86c3b10f28dd28aa | |
| parent | c46051337b972f8b5a302afb6f603df06fea527d (diff) | |
tests/kms_plane: Set output to PIPE_NONE at end of test_format_plane
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 <nicholas.kazlauskas@amd.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
| -rw-r--r-- | tests/kms_plane.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |