From: Lyude <lyude@redhat.com>
To: intel-gfx@lists.freedesktop.org
Cc: Lyude <lyude@redhat.com>
Subject: [RFC i-g-t v3 3/5] igt_kms: Add helpers for watching for sysfs hotplug events
Date: Wed, 30 Nov 2016 20:24:46 -0500 [thread overview]
Message-ID: <20161201012448.16334-4-lyude@redhat.com> (raw)
In-Reply-To: <20161201012448.16334-1-lyude@redhat.com>
This adds some basic helpers for connecting to udev and watching for
sysfs hotplug events.
Signed-off-by: Lyude <lyude@redhat.com>
Changes since v1:
- Remove unused arg from documentation
---
lib/igt_kms.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_kms.h | 6 ++++
2 files changed, 114 insertions(+)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 989704e..ca37c47 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -38,6 +38,10 @@
#elif HAVE_SYS_KD_H
#include <sys/kd.h>
#endif
+#ifdef HAVE_UDEV
+#include <libudev.h>
+#include <poll.h>
+#endif
#include <errno.h>
#include <time.h>
@@ -2760,6 +2764,110 @@ void igt_reset_connectors(void)
"detect");
}
+#ifdef HAVE_UDEV
+static struct udev_monitor *hotplug_mon;
+
+/**
+ * igt_watch_hotplug:
+ *
+ * Begin monitoring udev for hotplug events.
+ */
+void igt_watch_hotplug(void)
+{
+ struct udev *udev;
+ int ret, flags, fd;
+
+ if (hotplug_mon)
+ igt_cleanup_hotplug();
+
+ udev = udev_new();
+ igt_assert(udev != NULL);
+
+ hotplug_mon = udev_monitor_new_from_netlink(udev, "udev");
+ igt_assert(hotplug_mon != NULL);
+
+ ret = udev_monitor_filter_add_match_subsystem_devtype(hotplug_mon,
+ "drm",
+ "drm_minor");
+ igt_assert_eq(ret, 0);
+ ret = udev_monitor_filter_update(hotplug_mon);
+ igt_assert_eq(ret, 0);
+ ret = udev_monitor_enable_receiving(hotplug_mon);
+ igt_assert_eq(ret, 0);
+
+ /* Set the fd for udev as non blocking */
+ fd = udev_monitor_get_fd(hotplug_mon);
+ flags = fcntl(fd, F_GETFL, 0);
+ igt_assert(flags);
+
+ flags |= O_NONBLOCK;
+ igt_assert_neq(fcntl(fd, F_SETFL, flags), -1);
+}
+
+/**
+ * igt_hotplug_detected:
+ * @timeout_secs: How long to wait for a hotplug event to occur.
+ *
+ * Assert that a hotplug event was received since we last checked the monitor.
+ *
+ * Returns: true if a sysfs hotplug event was received, false if we timed out
+ */
+bool igt_hotplug_detected(int timeout_secs)
+{
+ struct udev_device *dev;
+ const char *hotplug_val;
+ struct pollfd fd = {
+ .fd = udev_monitor_get_fd(hotplug_mon),
+ .events = POLLIN
+ };
+ bool hotplug_received = false;
+
+ /* Go through all of the events pending on the udev monitor. Once we
+ * receive a hotplug, we continue going through the rest of the events
+ * so that redundant hotplug events don't change the results of future
+ * checks
+ */
+ while (!hotplug_received && poll(&fd, 1, timeout_secs * 1000)) {
+ dev = udev_monitor_receive_device(hotplug_mon);
+
+ hotplug_val = udev_device_get_property_value(dev, "HOTPLUG");
+ if (hotplug_val && atoi(hotplug_val) == 1)
+ hotplug_received = true;
+
+ udev_device_unref(dev);
+ }
+
+ return hotplug_received;
+}
+
+/**
+ * igt_flush_hotplugs:
+ *
+ * Get rid of any pending hotplug events
+ */
+void igt_flush_hotplugs(void)
+{
+ struct udev_device *dev;
+
+ while ((dev = udev_monitor_receive_device(hotplug_mon)))
+ udev_device_unref(dev);
+}
+
+/**
+ * igt_cleanup_hotplug:
+ *
+ * Cleanup the resources allocated by #igt_watch_hotplug
+ */
+void igt_cleanup_hotplug(void)
+{
+ struct udev *udev = udev_monitor_get_udev(hotplug_mon);
+
+ udev_monitor_unref(hotplug_mon);
+ hotplug_mon = NULL;
+ udev_unref(udev);
+}
+#endif
+
/**
* kmstest_get_vbl_flag:
* @pipe_id: Pipe to convert to flag representation.
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 6422adc..95395cd 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -479,5 +479,11 @@ uint32_t kmstest_get_vbl_flag(uint32_t pipe_id);
const unsigned char* igt_kms_get_base_edid(void);
const unsigned char* igt_kms_get_alt_edid(void);
+#ifdef HAVE_UDEV
+void igt_watch_hotplug(void);
+bool igt_hotplug_detected(int timeout_secs);
+void igt_flush_hotplugs(void);
+void igt_cleanup_hotplug(void);
+#endif
#endif /* __IGT_KMS_H__ */
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-01 1:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 1:24 [RFC i-g-t v3 0/5] Add support for the Chamelium Lyude
2016-12-01 1:24 ` [RFC i-g-t v3 1/5] igt_aux: Add igt_skip_without_suspend_support() Lyude
2016-12-01 1:24 ` [RFC i-g-t v3 2/5] igt_aux: Add igt_set_autoresume_delay() Lyude
2016-12-01 1:24 ` Lyude [this message]
2016-12-01 1:24 ` [RFC i-g-t v3 4/5] igt_debugfs: Make igt_crc_to_string() work with other CRC types Lyude
2016-12-01 1:24 ` [RFC i-g-t v3 5/5] Add support for hotplug testing with the Chamelium Lyude
2016-12-07 11:27 ` Tomeu Vizoso
2016-12-07 19:56 ` Lyude Paul
2016-12-08 7:51 ` Tomeu Vizoso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161201012448.16334-4-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).