[igt-dev] [PATCH i-g-t 4/9] tests/kms_lease: test implicit primary plane usage in page_flip ioctl

[Daniel Vetter <daniel.vetter@ffwll.ch>]

We need to make sure that legacy ioctls don't operate on a lease if
the lesse doesn't have access to the implicitly used primary plane.

Current kernels fail this.

Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/kms_lease.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 4823121e8cf4..6453c7beafd8 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -311,6 +311,67 @@ static void simple_lease(data_t *data)
 	terminate_lease(&lease);
 }
 
+static void page_flip_implicit_plane(data_t *data)
+{
+	uint32_t object_ids[3];
+	struct local_drm_mode_create_lease mcl;
+	drmModePlaneRes *plane_resources;
+	uint32_t wrong_plane_id = 0;
+	int i;
+
+	/* find a plane which isn't the primary one for us */
+	plane_resources = drmModeGetPlaneResources(data->master.fd);
+	for (i = 0; i < plane_resources->count_planes; i++) {
+		if (plane_resources->planes[i] != data->plane_id) {
+			wrong_plane_id = plane_resources->planes[i];
+			break;
+		}
+	}
+	drmModeFreePlaneResources(plane_resources);
+	igt_require(wrong_plane_id);
+
+	mcl.object_ids = (uint64_t) (uintptr_t) &object_ids[0];
+	mcl.object_count = 0;
+	mcl.flags = 0;
+
+	object_ids[mcl.object_count++] = data->connector_id;
+	object_ids[mcl.object_count++] = data->crtc_id;
+
+	drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 0);
+	do_or_die(create_lease(data->master.fd, &mcl));
+	drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
+
+	/* Set a mode on the leased output */
+	igt_assert_eq(0, prepare_crtc(&data->master, data->connector_id, data->crtc_id));
+
+	/* sanity check */
+	do_or_die(drmModePageFlip(data->master.fd, data->crtc_id,
+			      data->master.primary_fb.fb_id,
+			      0, NULL));
+	igt_wait_for_vblank_count(data->master.fd,
+				  crtc_id_to_pipe(&data->master.display, data->crtc_id),
+				  1);
+	do_or_die(drmModePageFlip(mcl.fd, data->crtc_id,
+			      data->master.primary_fb.fb_id,
+			      0, NULL));
+	close(mcl.fd);
+
+	object_ids[mcl.object_count++] = wrong_plane_id;
+	do_or_die(create_lease(data->master.fd, &mcl));
+
+	igt_wait_for_vblank_count(data->master.fd,
+				  crtc_id_to_pipe(&data->master.display, data->crtc_id),
+				  1);
+	igt_assert_eq(drmModePageFlip(mcl.fd, data->crtc_id,
+				      data->master.primary_fb.fb_id,
+				      0, NULL),
+		      -EACCES);
+	close(mcl.fd);
+
+	cleanup_crtc(&data->master,
+		     connector_id_to_output(&data->master.display, data->connector_id));
+}
+
 /* Test listing lessees */
 static void lessee_list(data_t *data)
 {
@@ -1024,6 +1085,7 @@ igt_main
 		{ "lease_invalid_connector", lease_invalid_connector },
 		{ "lease_invalid_crtc", lease_invalid_crtc },
 		{ "lease_invalid_plane", lease_invalid_plane },
+		{ "page_flip_implicit_plane", page_flip_implicit_plane },
 		{ }
 	}, *f;
 
-- 
2.14.4

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev