From: Daniel Stone <daniels@xxxxxxxxxxxxx>
Mirroring addfb2, add tests for the new ioctl which will return us
information about framebuffers containing multiple buffers, as well as
modifiers.
Changes since v4:
- Remove unnecessary bo creation for getfb2-handle-closed subtest
Changes since v3:
- Add subtests to ensure handles aren't returned for non-root and
non-master callers
Changes since v1:
- Add test that uses getfb2 output to call addfb2 as suggested by Ville
Signed-off-by: Daniel Stone <daniels@xxxxxxxxxxxxx>
Signed-off-by: Juston Li <juston.li@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
tests/kms_getfb.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 156 insertions(+)
diff --git a/tests/kms_getfb.c b/tests/kms_getfb.c
index 292679ad3eb9..e046a43a1555 100644
--- a/tests/kms_getfb.c
+++ b/tests/kms_getfb.c
@@ -40,6 +40,8 @@
#include "drm.h"
#include "drm_fourcc.h"
+#include "igt_device.h"
+
static bool has_getfb_iface(int fd)
{
struct drm_mode_fb_cmd arg = { };
@@ -252,6 +254,154 @@ static void test_duplicate_handles(int fd)
}
}
+static void test_getfb2(int fd)
+{
+ struct drm_mode_fb_cmd2 add_basic = {};
+
+ igt_fixture {
+ struct drm_mode_fb_cmd2 get = {};
+
+ add_basic.width = 1024;
+ add_basic.height = 1024;
+ add_basic.pixel_format = DRM_FORMAT_XRGB8888;
+ add_basic.pitches[0] = 1024*4;
+ add_basic.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
+ DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+ igt_assert(add_basic.handles[0]);
+ do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add_basic);
+
+ get.fb_id = add_basic.fb_id;
+ do_ioctl(fd, DRM_IOCTL_MODE_GETFB2, &get);
+ igt_assert_neq_u32(get.handles[0], 0);
+ gem_close(fd, get.handles[0]);
+ }
+
+ igt_subtest("getfb2-handle-zero") {
+ struct drm_mode_fb_cmd2 get = {};
+ do_ioctl_err(fd, DRM_IOCTL_MODE_GETFB2, &get, ENOENT);
+ }
+
+ igt_subtest("getfb2-handle-closed") {
+ struct drm_mode_fb_cmd2 add = add_basic;
+ struct drm_mode_fb_cmd2 get = { };
+
+ do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add);
+ do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &add.fb_id);
+
+ get.fb_id = add.fb_id;
+ do_ioctl_err(fd, DRM_IOCTL_MODE_GETFB2, &get, ENOENT);
+ }
+
+ igt_subtest("getfb2-handle-not-fb") {
+ struct drm_mode_fb_cmd2 get = { .fb_id = get_any_prop_id(fd) };
+ igt_require(get.fb_id > 0);
+ do_ioctl_err(fd, DRM_IOCTL_MODE_GETFB2, &get, ENOENT);
+ }
+
+ igt_subtest("getfb2-accept-ccs") {
+ struct drm_mode_fb_cmd2 add_ccs = { };
+ struct drm_mode_fb_cmd2 get = { };
+ int i;
+
+ get_ccs_fb(fd, &add_ccs);
+ igt_require(add_ccs.fb_id != 0);
+ get.fb_id = add_ccs.fb_id;
+ do_ioctl(fd, DRM_IOCTL_MODE_GETFB2, &get);
+
+ igt_assert_eq_u32(get.width, add_ccs.width);
+ igt_assert_eq_u32(get.height, add_ccs.height);
+ igt_assert(get.flags & DRM_MODE_FB_MODIFIERS);
+
+ for (i = 0; i < ARRAY_SIZE(get.handles); i++) {
+ igt_assert_eq_u32(get.pitches[i], add_ccs.pitches[i]);
+ igt_assert_eq_u32(get.offsets[i], add_ccs.offsets[i]);
+ if (add_ccs.handles[i] != 0) {
+ igt_assert_neq_u32(get.handles[i], 0);
+ igt_assert_neq_u32(get.handles[i],
+ add_ccs.handles[i]);
+ igt_assert_eq_u64(get.modifier[i],
+ add_ccs.modifier[i]);
+ } else {
+ igt_assert_eq_u32(get.handles[i], 0);
+ igt_assert_eq_u64(get.modifier[i], 0);
+ }
+ }
+ igt_assert_eq_u32(get.handles[0], get.handles[1]);
+
+ do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &get.fb_id);
+ gem_close(fd, add_ccs.handles[0]);
+ gem_close(fd, get.handles[0]);
+ }
+
+ igt_subtest("getfb2-into-addfb2") {
+ struct drm_mode_fb_cmd2 cmd = { };
+
+ cmd.fb_id = add_basic.fb_id;
+ do_ioctl(fd, DRM_IOCTL_MODE_GETFB2, &cmd);
+ do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &cmd);
+
+ do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &cmd.fb_id);
+ gem_close(fd, cmd.handles[0]);
+ }
+
+ igt_fixture {
+ do_ioctl(fd, DRM_IOCTL_MODE_RMFB, &add_basic.fb_id);
+ gem_close(fd, add_basic.handles[0]);
+ }
+}
+
+static void test_handle_protection(void) {
+ int non_master_fd;
+ struct drm_mode_fb_cmd2 non_master_add = {};
+
+ igt_fixture {
+ non_master_fd = drm_open_driver(DRIVER_ANY);
+
+ non_master_add.width = 1024;
+ non_master_add.height = 1024;
+ non_master_add.pixel_format = DRM_FORMAT_XRGB8888;
+ non_master_add.pitches[0] = 1024*4;
+ non_master_add.handles[0] = igt_create_bo_with_dimensions(non_master_fd, 1024, 1024,
+ DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+ igt_require(non_master_add.handles[0] != 0);
+ do_ioctl(non_master_fd, DRM_IOCTL_MODE_ADDFB2, &non_master_add);
+ }
+
+ igt_subtest("getfb-handle-protection") {
+ struct drm_mode_fb_cmd get = { .fb_id = non_master_add.fb_id};
+
+ igt_fork(child, 1) {
+ igt_drop_root();
+
+ do_ioctl(non_master_fd, DRM_IOCTL_MODE_GETFB, &get);
+ /* ioctl succeeds but handle should be 0 */
+ igt_assert_eq_u32(get.handle, 0);
+ }
+ igt_waitchildren();
+ }
+
+ igt_subtest("getfb2-handle-protection") {
+ struct drm_mode_fb_cmd2 get = { .fb_id = non_master_add.fb_id};
+ int i;
+
+ igt_fork(child, 1) {
+ igt_drop_root();
+
+ do_ioctl(non_master_fd, DRM_IOCTL_MODE_GETFB2, &get);
+ /* ioctl succeeds but handles should be 0 */
+ for (i = 0; i < ARRAY_SIZE(get.handles); i++) {
+ igt_assert_eq_u32(get.handles[i], 0);
+ }
+ }
+ igt_waitchildren();
+ }
+
+ igt_fixture {
+ do_ioctl(non_master_fd, DRM_IOCTL_MODE_RMFB, &non_master_add.fb_id);
+ gem_close(non_master_fd, non_master_add.handles[0]);
+ }
+}
+
igt_main
{
int fd;
@@ -267,6 +417,12 @@ igt_main
igt_subtest_group
test_duplicate_handles(fd);
+ igt_subtest_group
+ test_getfb2(fd);
+
+ igt_subtest_group
+ test_handle_protection();
+
igt_fixture
close(fd);
}
--
2.21.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
