diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-20 22:17:39 +0100 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-02-22 16:18:28 +0100 |
commit | d1e352d15a6c6e1062ee60198795809435d1bb47 (patch) | |
tree | 48b382002e51e2a22896b94d98c98bf69bf042aa /lib/igt_kms.c | |
parent | d57546bd07cbf25dbb32b959110daf2b6f42ce9d (diff) |
tests/kms_lease: exercise uevent
And make sure we get the LEASE=1 value, indicating a lessee change.
v2: Apparently netlink reading can leak EAGAIN out through
udev_monitor_receive_device. No idea what's going on there, so let's
wrap some duct tape around it.
v3: Lyude reported that we might get a few udev events on startup of
the test. Drain those first.
v4: Use the igt hotplug library functions, they already take care of
all the uevent special cases.
Cc: Lyude Paul <lyude@redhat.com>
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib/igt_kms.c')
-rw-r--r-- | lib/igt_kms.c | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 080f90ae..761bb193 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -4015,16 +4015,8 @@ struct udev_monitor *igt_watch_hotplug(void) return mon; } -/** - * igt_hotplug_detected: - * @mon: A udev monitor initialized with #igt_watch_hotplug - * @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(struct udev_monitor *mon, int timeout_secs) +static bool event_detected(struct udev_monitor *mon, int timeout_secs, + const char *property) { struct udev_device *dev; const char *hotplug_val; @@ -4042,7 +4034,7 @@ bool igt_hotplug_detected(struct udev_monitor *mon, int timeout_secs) while (!hotplug_received && poll(&fd, 1, timeout_secs * 1000)) { dev = udev_monitor_receive_device(mon); - hotplug_val = udev_device_get_property_value(dev, "HOTPLUG"); + hotplug_val = udev_device_get_property_value(dev, property); if (hotplug_val && atoi(hotplug_val) == 1) hotplug_received = true; @@ -4053,6 +4045,34 @@ bool igt_hotplug_detected(struct udev_monitor *mon, int timeout_secs) } /** + * igt_hotplug_detected: + * @mon: A udev monitor initialized with #igt_watch_hotplug + * @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(struct udev_monitor *mon, int timeout_secs) +{ + return event_detected(mon, timeout_secs, "HOTPLUG"); +} + +/** + * igt_lease_change_detected: + * @mon: A udev monitor initialized with #igt_watch_hotplug + * @timeout_secs: How long to wait for a lease change event to occur. + * + * Assert that a lease change event was received since we last checked the monitor. + * + * Returns: true if a sysfs lease change event was received, false if we timed out + */ +bool igt_lease_change_detected(struct udev_monitor *mon, int timeout_secs) +{ + return event_detected(mon, timeout_secs, "LEASE"); +} + +/** * igt_flush_hotplugs: * @mon: A udev monitor initialized with #igt_watch_hotplug * |