Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:03:11 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: ktime.h
Log Message:
New ktime utilities. Fix monotonic offset business.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/ktime.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/include/linux/ktime.h
diff -u src/sys/external/bsd/drm2/include/linux/ktime.h:1.3 src/sys/external/bsd/drm2/include/linux/ktime.h:1.4
--- src/sys/external/bsd/drm2/include/linux/ktime.h:1.3 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/include/linux/ktime.h Mon Aug 27 07:03:11 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ktime.h,v 1.3 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: ktime.h,v 1.4 2018/08/27 07:03:11 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -100,12 +100,17 @@ ktime_to_timeval(ktime_t kt)
}
static inline ktime_t
+timespec_to_ktime(struct timespec ts)
+{
+ return ns_to_ktime(1000000000*ts.tv_sec + ts.tv_nsec);
+}
+
+static inline ktime_t
ktime_get(void)
{
struct timespec ts;
ktime_t kt;
- /* XXX nanotime or nanouptime? */
nanouptime(&ts);
/* XXX Silently truncate? */
@@ -116,9 +121,34 @@ ktime_get(void)
}
static inline ktime_t
+ktime_get_real(void)
+{
+ struct timespec ts;
+ ktime_t kt;
+
+ nanotime(&ts);
+
+ /* XXX Silently truncate? */
+ kt.kt_sec_nsec.ktsn_sec = ts.tv_sec & 0xffffffffUL;
+ kt.kt_sec_nsec.ktsn_nsec = ts.tv_nsec;
+
+ return kt;
+}
+
+static inline ktime_t
ktime_get_monotonic_offset(void)
{
- return ns_to_ktime(0); /* XXX Obviously wrong! Revisit. */
+ return timespec_to_ktime(boottime);
+}
+
+static inline ktime_t
+ktime_mono_to_real(ktime_t kt)
+{
+ struct timespec ts = ktime_to_timespec(kt);
+
+ timespecadd(&ts, &boottime, &ts);
+
+ return timespec_to_ktime(ts);
}
static inline bool
