From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id D31DC10E3E2 for ; Wed, 1 Feb 2023 10:18:48 +0000 (UTC) From: Mohammed Thasleem To: igt-dev@lists.freedesktop.org Date: Wed, 1 Feb 2023 15:42:29 +0530 Message-Id: <20230201101229.143115-1-mohammed.thasleem@intel.com> In-Reply-To: <20230130094701.111985-1-mohammed.thasleem@intel.com> References: <20230130094701.111985-1-mohammed.thasleem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t] tests/kms_lease: close mcl.fd when drmModeSetCrtc fails List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Close mcl.fd even when drmModeSetCrtc retuns fail. This will unblock the resources, so that test can continue to execute on another panels. v2: Removed if loop and updated the description. (Karthik) v3: Added igt_assert_eq for both master fd and mcl fd. (Karthik) v4: Minor updates in description. (Karthik) Signed-off-by: Mohammed Thasleem --- tests/kms_lease.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/kms_lease.c b/tests/kms_lease.c index 67e8d3be..6bd5bc15 100644 --- a/tests/kms_lease.c +++ b/tests/kms_lease.c @@ -317,6 +317,7 @@ static void setcrtc_implicit_plane(data_t *data) struct drm_mode_create_lease mcl; drmModePlaneRes *plane_resources; uint32_t wrong_plane_id = 0; + int ret = 0, ret_mcl = 0; igt_output_t *output = connector_id_to_output(&data->master.display, data->connector_id); @@ -349,11 +350,13 @@ static void setcrtc_implicit_plane(data_t *data) igt_assert_eq(0, prepare_crtc(&data->master, data)); /* sanity check */ - do_or_die(drmModeSetCrtc(data->master.fd, data->crtc_id, -1, - 0, 0, object_ids, 1, mode)); - do_or_die(drmModeSetCrtc(mcl.fd, data->crtc_id, -1, - 0, 0, object_ids, 1, mode)); + ret = drmModeSetCrtc(data->master.fd, data->crtc_id, -1, + 0, 0, object_ids, 1, mode); + ret_mcl = drmModeSetCrtc(mcl.fd, data->crtc_id, -1, + 0, 0, object_ids, 1, mode); close(mcl.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)); -- 2.25.1