public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/kms_lease: close mcl.fd when drmModeSetCrtc fails
@ 2023-01-17  8:05 Mohammed Thasleem
  2023-01-17 14:00 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (10 more replies)
  0 siblings, 11 replies; 15+ messages in thread
From: Mohammed Thasleem @ 2023-01-17  8:05 UTC (permalink / raw)
  To: igt-dev

Close mcl.fd when drmModeSetCrtc retuns fail and it will
unblock the resources for other subtests execution with
out fail.

Signed-off-by: Mohammed Thasleem <mohammed.thasleem@intel.com>
---
 tests/kms_lease.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 67e8d3be..c1cf8567 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;
 	igt_output_t *output =
 		connector_id_to_output(&data->master.display,
 				       data->connector_id);
@@ -351,10 +352,14 @@ static void setcrtc_implicit_plane(data_t *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));
-	close(mcl.fd);
+	ret = drmModeSetCrtc(mcl.fd, data->crtc_id, -1, 0, 0, object_ids,
+			     1, mode);
+	if (ret) {
+		close(mcl.fd);
+		igt_assert_eq(ret, 0);
+	}
 
+	close(mcl.fd);
 	object_ids[mcl.object_count++] = wrong_plane_id;
 	do_or_die(create_lease(data->master.fd, &mcl));
 
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2023-02-02 11:38 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-17  8:05 [igt-dev] [PATCH i-g-t] tests/kms_lease: close mcl.fd when drmModeSetCrtc fails Mohammed Thasleem
2023-01-17 14:00 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-17 17:27 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-01-18  6:47 ` [igt-dev] [PATCH i-g-t] " Karthik B S
2023-01-18  7:33 ` Mohammed Thasleem
2023-01-19  6:34   ` Karthik B S
2023-01-18  8:09 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_lease: close mcl.fd when drmModeSetCrtc fails (rev2) Patchwork
2023-01-19  0:12 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-01-30  9:47 ` [igt-dev] [PATCH i-g-t] tests/kms_lease: close mcl.fd when drmModeSetCrtc fails Mohammed Thasleem
2023-02-01 10:12   ` Mohammed Thasleem
2023-02-02 11:38     ` Karthik B S
2023-01-30 10:21 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_lease: close mcl.fd when drmModeSetCrtc fails (rev3) Patchwork
2023-01-30 11:54 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-02-01 10:44 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_lease: close mcl.fd when drmModeSetCrtc fails (rev4) Patchwork
2023-02-01 11:53 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox