diff options
author | Antonio Argenziano <antonio.argenziano@intel.com> | 2018-02-23 15:14:40 -0800 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-02-27 13:58:56 +0200 |
commit | d75e676ffdf5095a5f4361110a760bf0d902f80f (patch) | |
tree | 269d35a7e0d6a0263c42927a6f464548de6cba52 /lib | |
parent | 148737b8f9d22388ef2ae517c3512469f323f8e8 (diff) |
igt: Make libudev mandatory
Since more essential components use libudev, make its dependency
mandatory.
Signed-off-by: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/igt_aux.c | 14 | ||||
-rw-r--r-- | lib/igt_kms.c | 6 | ||||
-rw-r--r-- | lib/igt_kms.h | 2 |
3 files changed, 2 insertions, 20 deletions
diff --git a/lib/igt_aux.c b/lib/igt_aux.c index a23375a4..aabf6e50 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -50,6 +50,7 @@ #include <assert.h> #include <proc/readproc.h> +#include <libudev.h> #include "drmtest.h" #include "i915_drm.h" @@ -425,8 +426,6 @@ void igt_stop_shrink_helper(void) igt_stop_helper(&shrink_helper); } -#ifdef HAVE_UDEV -#include <libudev.h> static struct igt_helper_process hang_detector; static void __attribute__((noreturn)) @@ -506,17 +505,6 @@ void igt_stop_hang_detector(void) { igt_stop_helper(&hang_detector); } -#else -void igt_fork_hang_detector(int fd) -{ - if (igt_only_list_subtests()) - return; -} - -void igt_stop_hang_detector(void) -{ -} -#endif /** * igt_check_boolean_env_var: diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 8c10eb5b..022abfe7 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -39,9 +39,8 @@ #elif HAVE_SYS_KD_H #include <sys/kd.h> #endif -#ifdef HAVE_UDEV + #include <libudev.h> -#endif #include <poll.h> #include <errno.h> #include <time.h> @@ -3698,8 +3697,6 @@ void igt_reset_connectors(void) "detect"); } -#ifdef HAVE_UDEV - /** * igt_watch_hotplug: * @@ -3804,7 +3801,6 @@ void igt_cleanup_hotplug(struct udev_monitor *mon) mon = NULL; udev_unref(udev); } -#endif /** * kmstest_get_vbl_flag: diff --git a/lib/igt_kms.h b/lib/igt_kms.h index eb147152..1c46186e 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -665,12 +665,10 @@ 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 struct udev_monitor *igt_watch_hotplug(void); bool igt_hotplug_detected(struct udev_monitor *mon, int timeout_secs); void igt_flush_hotplugs(struct udev_monitor *mon); void igt_cleanup_hotplug(struct udev_monitor *mon); -#endif #endif /* __IGT_KMS_H__ */ |