Skip to content
Snippets Groups Projects
Commit 9b6810b1 authored by Alex Hung's avatar Alex Hung
Browse files

tests/kms_plane_multiple: turn off pipe if all planes are off

amdgpu rejects when crtc is on + all planes are off, and it
is necessary to turn off crtc when all planes are off in the
subtest "tiling-none".

This is revised from https://patchwork.freedesktop.org/series/80904/



Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
parent 8d33b611
No related branches found
No related tags found
No related merge requests found
...@@ -311,6 +311,7 @@ test_plane_position_with_output(data_t *data, enum pipe pipe, ...@@ -311,6 +311,7 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
for_each_plane_on_pipe(&data->display, pipe, plane) for_each_plane_on_pipe(&data->display, pipe, plane)
igt_plane_set_fb(plane, NULL); igt_plane_set_fb(plane, NULL);
igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit2(&data->display, COMMIT_ATOMIC); igt_display_commit2(&data->display, COMMIT_ATOMIC);
for (int x = 0; x < c; x++) for (int x = 0; x < c; x++)
...@@ -326,16 +327,12 @@ test_plane_position_with_output(data_t *data, enum pipe pipe, ...@@ -326,16 +327,12 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
i = 0; i = 0;
while (i < iterations || loop_forever) { while (i < iterations || loop_forever) {
/* Intel devices need it here, timing sensitive on few devices */
if (is_i915_device(data->drm_fd))
igt_pipe_crc_start(data->pipe_crc);
/* randomize planes and set up the holes */ /* randomize planes and set up the holes */
prepare_planes(data, pipe, &blue, modifier, c, output); prepare_planes(data, pipe, &blue, modifier, c, output);
igt_display_commit2(&data->display, COMMIT_ATOMIC); igt_display_commit2(&data->display, COMMIT_ATOMIC);
if (!is_i915_device(data->drm_fd)) igt_pipe_crc_start(data->pipe_crc);
igt_pipe_crc_start(data->pipe_crc);
igt_pipe_crc_get_current(data->display.drm_fd, data->pipe_crc, &crc); igt_pipe_crc_get_current(data->display.drm_fd, data->pipe_crc, &crc);
igt_assert_crc_equal(&data->ref_crc, &crc); igt_assert_crc_equal(&data->ref_crc, &crc);
...@@ -344,6 +341,7 @@ test_plane_position_with_output(data_t *data, enum pipe pipe, ...@@ -344,6 +341,7 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
for_each_plane_on_pipe(&data->display, pipe, plane) for_each_plane_on_pipe(&data->display, pipe, plane)
igt_plane_set_fb(plane, NULL); igt_plane_set_fb(plane, NULL);
igt_output_set_pipe(output, PIPE_NONE);
igt_display_commit2(&data->display, COMMIT_ATOMIC); igt_display_commit2(&data->display, COMMIT_ATOMIC);
for (int x = 0; x < c; x++) for (int x = 0; x < c; x++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment