Thread (21 messages) 21 messages, 3 authors, 2018-05-16

[igt-dev] [PATCH i-g-t] lib/igt_device: Add information why cannot drop drm master

From: Katarzyna Dec <hidden>
Date: 2018-05-14 10:19:39
Subsystem: library code, the rest · Maintainers: Andrew Morton, Linus Torvalds

Let's add additional information to igt_device_drop_master
in case we try to run tests with e.g. x11 enabled.

Signed-off-by: Katarzyna Dec <redacted>
Cc: Chris Wilson <redacted>
---
 lib/igt_device.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/igt_device.c b/lib/igt_device.c
index 8a2dd0e3..96fde899 100644
--- a/lib/igt_device.c
+++ b/lib/igt_device.c
@@ -74,5 +74,9 @@ int __igt_device_drop_master(int fd)
  */
 void igt_device_drop_master(int fd)
 {
-	igt_assert_eq(__igt_device_drop_master(fd), 0);
+	if (__igt_device_drop_master(fd)) {
+		igt_require_f(__igt_device_drop_master(fd) == 0,
+			      "Can't drop DRM master, "
+			      "please check if no other DRM client is running.\n");
+	}
 }
-- 
2.14.3

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help