Add expect-to-fail tests for invalid rotations on each of the plane types. Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> Signed-off-by: Matthew Auld <matthew.auld@xxxxxxxxx> --- tests/kms_rotation_crc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index f94f8f1..a0a5a0f 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -479,6 +479,68 @@ err_commit: igt_assert(ret == 0); } +static void test_plane_rotation_invalid(data_t *data, enum igt_plane plane_type) +{ + igt_display_t *display = &data->display; + uint64_t tiling = LOCAL_DRM_FORMAT_MOD_NONE; + uint32_t format = DRM_FORMAT_XRGB8888; + int bpp = igt_drm_format_to_bpp(format); + enum igt_commit_style commit = COMMIT_LEGACY; + int fd = data->gfx_fd; + igt_output_t *output = &display->outputs[0]; + igt_plane_t *plane; + drmModeModeInfo *mode; + unsigned int stride, size, w, h; + uint32_t gem_handle; + int ret; + + igt_require(output != NULL && output->valid == true); + + plane = igt_output_get_plane(output, plane_type); + igt_require(igt_plane_supports_rotation(plane)); + + if (plane_type == IGT_PLANE_PRIMARY || plane_type == IGT_PLANE_CURSOR) { + igt_require(data->display.has_universal_planes); + commit = COMMIT_UNIVERSAL; + } + + mode = igt_output_get_mode(output); + w = mode->hdisplay; + h = mode->vdisplay; + + for (stride = 512; stride < (w * bpp / 8); stride *= 2) + ; + for (size = 1024*1024; size < stride * h; size *= 2) + ; + + gem_handle = gem_create(fd, size); + ret = __gem_set_tiling(fd, gem_handle, I915_TILING_Y, stride); + igt_assert(ret == 0); + + do_or_die(__kms_addfb(fd, gem_handle, w, h, stride, + format, tiling, LOCAL_DRM_MODE_FB_MODIFIERS, + &data->fb.fb_id)); + data->fb.width = w; + data->fb.height = h; + data->fb.gem_handle = gem_handle; + + igt_plane_set_fb(plane, NULL); + igt_display_commit(display); + + igt_plane_set_rotation(plane, data->rotation); + igt_plane_set_fb(plane, &data->fb); + + drmModeObjectSetProperty(fd, plane->drm_plane->plane_id, + DRM_MODE_OBJECT_PLANE, + plane->rotation_property, + plane->rotation); + ret = igt_display_try_commit2(display, commit); + + kmstest_restore_vt_mode(); + igt_remove_fb(fd, &data->fb); + igt_assert_eq(ret, -EINVAL); +} + igt_main { data_t data = {}; @@ -579,6 +641,40 @@ igt_main test_plane_rotation_exhaust_fences(&data, IGT_PLANE_PRIMARY); } + igt_subtest_f("primary-rotation-90-invalid") { + igt_require(gen < 9); + data.rotation = IGT_ROTATION_90; + test_plane_rotation_invalid(&data, IGT_PLANE_PRIMARY); + } + + igt_subtest_f("primary-rotation-270-invalid") { + igt_require(gen < 9); + data.rotation = IGT_ROTATION_270; + test_plane_rotation_invalid(&data, IGT_PLANE_PRIMARY); + } + + igt_subtest_f("sprite-rotation-90-invalid") { + igt_require(gen < 9); + data.rotation = IGT_ROTATION_90; + test_plane_rotation_invalid(&data, IGT_PLANE_2); + } + + igt_subtest_f("sprite-rotation-270-invalid") { + igt_require(gen < 9); + data.rotation = IGT_ROTATION_270; + test_plane_rotation_invalid(&data, IGT_PLANE_2); + } + + igt_subtest_f("cursor-rotation-90-invalid") { + data.rotation = IGT_ROTATION_90; + test_plane_rotation_invalid(&data, IGT_PLANE_CURSOR); + } + + igt_subtest_f("cursor-rotation-270-invalid") { + data.rotation = IGT_ROTATION_270; + test_plane_rotation_invalid(&data, IGT_PLANE_CURSOR); + } + igt_fixture { igt_display_fini(&data.display); } -- 2.4.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx