Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:59:13 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_utils.h
Log Message:
provide timer_expired
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.2 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h Sun Dec 19 09:59:13 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_utils.h,v 1.2 2021/12/18 23:45:28 riastradh Exp $ */
+/* $NetBSD: i915_utils.h,v 1.3 2021/12/19 09:59:13 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -460,10 +460,17 @@ static inline void add_taint_for_CI(unsi
void cancel_timer(struct timer_list *t);
void set_timer_ms(struct timer_list *t, unsigned long timeout);
+#ifdef __linux__
static inline bool timer_expired(const struct timer_list *t)
{
return READ_ONCE(t->expires) && !timer_pending(t);
}
+#else
+static inline bool timer_expired(struct timer_list *t)
+{
+ return callout_expired(&t->tl_callout);
+}
+#endif
/*
* This is a lookalike for IS_ENABLED() that takes a kconfig value,
