summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Othman <ahmad.othman@amd.com>2021-12-06 17:02:00 +0800
committerRodrigo Siqueira <Rodrigo.Siqueira@amd.com>2021-12-07 10:21:00 -0500
commitbbe37679d42cfc112d4bde269c0e07f9449b4eff (patch)
treefaed749778aa49b513de2292af446453454989d2
parent8f5c265e388555b5a0d84f545d31440a0a8db62b (diff)
tests/amdgpu: fixes for test-4k-mpo
[Why] The test wasn't working on some setups and needs fixing [How] Added output pipe initialization Added checks for both 4k and 2160p Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Signed-off-by: Ahmad Othman <ahmad.othman@amd.com>
-rw-r--r--tests/amdgpu/amd_plane.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/amdgpu/amd_plane.c b/tests/amdgpu/amd_plane.c
index 09fd3b085..ba29bdd43 100644
--- a/tests/amdgpu/amd_plane.c
+++ b/tests/amdgpu/amd_plane.c
@@ -193,8 +193,10 @@ static void test_mpo_4k(data_t *data)
test_init(data);
/* Skip if not 4K resolution. */
- igt_skip_on(!(data->mode[0].hdisplay == 3840
- && data->mode[0].vdisplay == 2160));
+ igt_skip_on(!((data->mode[0].hdisplay == 4096
+ && data->mode[0].vdisplay == 2160)||
+ (data->mode[0].hdisplay == 3840
+ && data->mode[0].vdisplay == 2160)));
w = data->w[0];
h = data->h[0];
@@ -210,6 +212,7 @@ static void test_mpo_4k(data_t *data)
draw_color_alpha(&o_fb, cutout_x, cutout_y, cutout_w, cutout_h,
0.00, 0.00, 0.00, 0.00);
+ igt_output_set_pipe(data->output[0], data->pipe_id[0]);
igt_plane_set_fb(data->primary[0], &r_fb);
igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);