From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EC8110E30F for ; Tue, 3 Oct 2023 19:11:48 +0000 (UTC) From: Mohammed Thasleem To: igt-dev@lists.freedesktop.org Date: Wed, 4 Oct 2023 00:32:22 +0530 Message-Id: <20231003190222.47274-3-mohammed.thasleem@intel.com> In-Reply-To: <20231003190222.47274-1-mohammed.thasleem@intel.com> References: <20231003190222.47274-1-mohammed.thasleem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH v3 2/2] tests/kms_lease: Add wrapper to create lease and store mcl.fd List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Add wrapper to create lease and store mcl.fd and add wrapper to all required subtests. v2: -Add wrapper to create lease and store mcl.fd. (Ankit) -Update terminate lease. v3: Add wrapper to all required subtests. (Ankit) v4: -Update create_lease. (Karthik) v5: Use lease fd instead mcl.fd. Signed-off-by: Mohammed Thasleem --- tests/kms_lease.c | 142 ++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 69 deletions(-) diff --git a/tests/kms_lease.c b/tests/kms_lease.c index ad739677f..9cd69e2b5 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -279,15 +279,25 @@ static void cleanup_crtc(lease_t *lease, igt_output_t *output) igt_display_commit(display); } -static int create_lease(int fd, struct drm_mode_create_lease *mcl) +static int _create_lease(int fd, struct drm_mode_create_lease *mcl) { int err = 0; - if (igt_ioctl(fd, DRM_IOCTL_MODE_CREATE_LEASE, mcl)) err = -errno; return err; } +static int create_lease(int fd, struct drm_mode_create_lease *mcl, int *lease_fd) +{ + int ret; + + ret = _create_lease(fd, mcl); + + if (lease_fd != NULL) + *lease_fd = mcl->fd; + return ret; +} + static int revoke_lease(int fd, struct drm_mode_revoke_lease *mrl) { int err = 0; @@ -330,9 +340,7 @@ static int make_lease(data_t *data) /* We use universal planes, must add the primary plane */ object_ids[mcl.object_count++] = data->plane_id; - ret = create_lease(data->master.fd, &mcl); - data->lease.fd = mcl.fd; - + ret = create_lease(data->master.fd, &mcl, &data->lease.fd); if (ret) return ret; @@ -394,9 +402,9 @@ static void empty_lease(data_t *data) { struct drm_mode_create_lease mcl = {0}; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); - close(mcl.fd); + close(data->lease.fd); } static void page_flip_implicit_plane(data_t *data) @@ -428,7 +436,7 @@ static void page_flip_implicit_plane(data_t *data) 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)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); /* Set a mode on the leased output */ @@ -444,22 +452,22 @@ static void page_flip_implicit_plane(data_t *data) igt_wait_for_vblank(data->master.fd, display->pipes[pipe].crtc_offset); - do_or_die(drmModePageFlip(mcl.fd, data->crtc_id, + do_or_die(drmModePageFlip(data->lease.fd, data->crtc_id, data->master.primary_fb.fb_id, 0, NULL)); - close(mcl.fd); + close(data->lease.fd); object_ids[mcl.object_count++] = wrong_plane_id; - do_or_die(create_lease(data->master.fd, &mcl)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); igt_wait_for_vblank(data->master.fd, display->pipes[pipe].crtc_offset); - igt_assert_eq(drmModePageFlip(mcl.fd, data->crtc_id, + igt_assert_eq(drmModePageFlip(data->lease.fd, data->crtc_id, data->master.primary_fb.fb_id, 0, NULL), -EACCES); - close(mcl.fd); + close(data->lease.fd); cleanup_crtc(&data->master, connector_id_to_output(&data->master.display, data->connector_id)); @@ -497,7 +505,7 @@ static void setcrtc_implicit_plane(data_t *data) 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)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); /* @@ -505,7 +513,7 @@ static void setcrtc_implicit_plane(data_t *data) * then the client cap for aspect-ratio bits must be set. */ if (mode->flags & DRM_MODE_FLAG_PIC_AR_MASK) { - drmSetClientCap(mcl.fd, DRM_CLIENT_CAP_ASPECT_RATIO, 1); + drmSetClientCap(data->lease.fd, DRM_CLIENT_CAP_ASPECT_RATIO, 1); } /* Set a mode on the leased output */ @@ -514,23 +522,21 @@ static void setcrtc_implicit_plane(data_t *data) /* sanity check */ ret = drmModeSetCrtc(data->master.fd, data->crtc_id, -1, 0, 0, object_ids, 1, mode); - ret_mcl = drmModeSetCrtc(mcl.fd, data->crtc_id, -1, + ret_mcl = drmModeSetCrtc(data->lease.fd, data->crtc_id, -1, 0, 0, object_ids, 1, mode); - close(mcl.fd); + close(data->lease.fd); igt_assert_eq(ret, 0); igt_assert_eq(ret_mcl, 0); object_ids[mcl.object_count++] = wrong_plane_id; - do_or_die(create_lease(data->master.fd, &mcl)); - data->lease.fd = mcl.fd; - - igt_assert_eq(drmModeSetCrtc(mcl.fd, data->crtc_id, -1, + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); + igt_assert_eq(drmModeSetCrtc(data->lease.fd, data->crtc_id, -1, 0, 0, object_ids, 1, mode), -EACCES); /* make sure we are allowed to turn the CRTC off */ - do_or_die(drmModeSetCrtc(mcl.fd, data->crtc_id, + do_or_die(drmModeSetCrtc(data->lease.fd, data->crtc_id, 0, 0, 0, NULL, 0, NULL)); - close(mcl.fd); + close(data->lease.fd); cleanup_crtc(&data->master, connector_id_to_output(&data->master.display, data->connector_id)); @@ -549,7 +555,7 @@ static void cursor_implicit_plane(data_t *data) 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)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); /* Set a mode on the leased output */ @@ -557,16 +563,16 @@ static void cursor_implicit_plane(data_t *data) /* sanity check */ do_or_die(drmModeSetCursor(data->master.fd, data->crtc_id, 0, 0, 0)); - do_or_die(drmModeSetCursor(mcl.fd, data->crtc_id, 0, 0, 0)); - close(mcl.fd); + do_or_die(drmModeSetCursor(data->lease.fd, data->crtc_id, 0, 0, 0)); + close(data->lease.fd); /* primary plane is never the cursor */ object_ids[mcl.object_count++] = data->plane_id; - do_or_die(create_lease(data->master.fd, &mcl)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); - igt_assert_eq(drmModeSetCursor(mcl.fd, data->crtc_id, 0, 0, 0), + igt_assert_eq(drmModeSetCursor(data->lease.fd, data->crtc_id, 0, 0, 0), -EACCES); - close(mcl.fd); + close(data->lease.fd); cleanup_crtc(&data->master, connector_id_to_output(&data->master.display, data->connector_id)); @@ -624,8 +630,8 @@ static void atomic_implicit_crtc(data_t *data) drmModeFreeObjectProperties(props); igt_assert(crtc_id_prop); - do_or_die(create_lease(data->master.fd, &mcl)); - do_or_die(drmSetClientCap(mcl.fd, DRM_CLIENT_CAP_ATOMIC, 1)); + do_or_die(create_lease(data->master.fd, &mcl, &data->lease.fd)); + do_or_die(drmSetClientCap(data->lease.fd, DRM_CLIENT_CAP_ATOMIC, 1)); /* check CRTC_ID property on the plane */ req = drmModeAtomicAlloc(); @@ -638,7 +644,7 @@ static void atomic_implicit_crtc(data_t *data) ret = drmModeAtomicCommit(data->master.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); igt_assert(ret == 0 || ret == -EINVAL); - ret = drmModeAtomicCommit(mcl.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); + ret = drmModeAtomicCommit(data->lease.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); igt_assert(ret == -EACCES); drmModeAtomicFree(req); @@ -653,11 +659,11 @@ static void atomic_implicit_crtc(data_t *data) ret = drmModeAtomicCommit(data->master.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); igt_assert(ret == 0 || ret == -EINVAL); - ret = drmModeAtomicCommit(mcl.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); + ret = drmModeAtomicCommit(data->lease.fd, req, DRM_MODE_ATOMIC_TEST_ONLY, NULL); igt_assert(ret == -EACCES); drmModeAtomicFree(req); - close(mcl.fd); + close(data->lease.fd); } /* Test listing lessees */ @@ -961,76 +967,76 @@ static void invalid_create_leases(data_t *data) /* NULL array pointer */ mcl.object_count = 1; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EFAULT); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EFAULT); /* nil object */ object_ids[0] = 0; mcl.object_ids = (uint64_t) (uintptr_t) object_ids; mcl.object_count = 1; - igt_assert_eq(create_lease(data->master.fd, &mcl), -ENOENT); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -ENOENT); /* no crtc, non-universal_plane */ drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 0); object_ids[0] = data->master.display.outputs[0].id; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EINVAL); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EINVAL); /* no connector, non-universal_plane */ object_ids[0] = data->master.display.pipes[0].crtc_id; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EINVAL); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EINVAL); /* sanity check */ object_ids[0] = data->master.display.pipes[0].crtc_id; object_ids[1] = data->master.display.outputs[0].id; mcl.object_count = 2; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - close(mcl.fd); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + close(data->lease.fd); /* no plane, universal planes */ drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); - igt_assert_eq(create_lease(data->master.fd, &mcl), -EINVAL); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EINVAL); /* sanity check */ object_ids[2] = igt_pipe_get_plane_type(&data->master.display.pipes[0], DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id; mcl.object_count = 3; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - close(mcl.fd); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + close(data->lease.fd); /* array overflow, do a small scan around overflow sizes */ for (int i = 1; i <= 4; i++) { mcl.object_count = UINT32_MAX / sizeof(object_ids[0]) + i; - igt_assert_eq(create_lease(data->master.fd, &mcl), -ENOMEM); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -ENOMEM); } /* sanity check */ mcl.object_count = 3; mcl.flags = O_CLOEXEC | O_NONBLOCK; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - close(mcl.fd); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + close(data->lease.fd); /* invalid flags */ mcl.flags = -1; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EINVAL); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EINVAL); /* no subleasing */ mcl.object_count = 3; mcl.flags = 0; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - tmp_fd = mcl.fd; - igt_assert_eq(create_lease(tmp_fd, &mcl), -EINVAL); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + tmp_fd = data->lease.fd; + igt_assert_eq(_create_lease(tmp_fd, &mcl), -EINVAL); close(tmp_fd); /* no double-leasing */ - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - tmp_fd = mcl.fd; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EBUSY); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + tmp_fd = data->lease.fd; + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EBUSY); close(tmp_fd); /* no double leasing */ object_ids[3] = object_ids[2]; mcl.object_count = 4; /* Note: the ENOSPC is from idr double-insertion failing */ - ret = create_lease(data->master.fd, &mcl); + ret = _create_lease(data->master.fd, &mcl); assert_double_id_err(ret); /* no encoder leasing */ @@ -1038,7 +1044,7 @@ static void invalid_create_leases(data_t *data) igt_assert(resources); igt_assert(resources->count_encoders > 0); object_ids[3] = resources->encoders[0]; - igt_assert_eq(create_lease(data->master.fd, &mcl), -EINVAL); + igt_assert_eq(_create_lease(data->master.fd, &mcl), -EINVAL); drmModeFreeResources(resources); } @@ -1124,19 +1130,17 @@ static void possible_crtcs_filtering(data_t *data) mcl.flags = 0; for (i = 0; i < resources->count_crtcs; i++) { - int lease_fd; object_ids[mcl.object_count - 1] = resources->crtcs[i]; - igt_assert_eq(create_lease(master_fd, &mcl), 0); - lease_fd = mcl.fd; + igt_assert_eq(create_lease(master_fd, &mcl, &data->lease.fd), 0); - drmSetClientCap(lease_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); + drmSetClientCap(data->lease.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); - check_crtc_masks(master_fd, lease_fd, 1 << i); + check_crtc_masks(master_fd, data->lease.fd, 1 << i); - close(lease_fd); + close(data->lease.fd); } free(object_ids); @@ -1163,7 +1167,7 @@ static int _create_simple_lease(int master_fd, data_t *data, int expected_ret) mcl.object_count = 3; mcl.flags = 0; - igt_assert_eq(create_lease(master_fd, &mcl), expected_ret); + igt_assert_eq(_create_lease(master_fd, &mcl), expected_ret); return expected_ret == 0 ? mcl.fd : 0; } @@ -1257,32 +1261,32 @@ static void implicit_plane_lease(data_t *data) mcl.flags = 0; /* sanity check */ - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); - close(mcl.fd); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); + close(data->lease.fd); drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 0); /* non universal plane automatically adds primary/cursor plane */ mcl.object_count = 2; - igt_assert_eq(create_lease(data->master.fd, &mcl), 0); + igt_assert_eq(create_lease(data->master.fd, &mcl, &data->lease.fd), 0); mgl.pad = 0; mgl.count_objects = 0; mgl.objects_ptr = 0; - igt_assert_eq(get_lease(mcl.fd, &mgl), 0); + igt_assert_eq(get_lease(data->lease.fd, &mgl), 0); igt_assert_eq(mgl.count_objects, 3 + (cursor_id ? 1 : 0)); - close(mcl.fd); + close(data->lease.fd); /* check that implicit lease doesn't lead to confusion when * explicitly adding primary plane */ mcl.object_count = 3; - ret = create_lease(data->master.fd, &mcl); + ret = _create_lease(data->master.fd, &mcl); assert_double_id_err(ret); /* same for the cursor */ object_ids[2] = cursor_id; - ret = create_lease(data->master.fd, &mcl); + ret = _create_lease(data->master.fd, &mcl); assert_double_id_err(ret); drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); -- 2.25.1