drm/vmwgfx: use monotonic event timestamps
authorArnd Bergmann <arnd@arndb.de>
Tue, 16 Jan 2018 17:18:43 +0000 (18:18 +0100)
committerThomas Hellstrom <thellstrom@vmware.com>
Thu, 22 Mar 2018 11:08:24 +0000 (12:08 +0100)
DRM_VMW_EVENT_FENCE_SIGNALED (struct drm_vmw_event_fence) and
DRM_EVENT_VBLANK (struct drm_event_vblank) pass timestamps in 32-bit
seconds/microseconds format.

As of commit c61eef726a78 ("drm: add support for monotonic vblank
timestamps"), other DRM drivers use monotonic times for drm_event_vblank,
but vmwgfx still uses CLOCK_REALTIME for both events, which suffers from
the y2038/y2106 overflow as well as time jumps.

For consistency, this changes vmwgfx to use ktime_get_ts64 as well,
which solves those problems and avoids the deprecated do_gettimeofday()
function.

This should be transparent to to user space, as long as it doesn't
compare the time against the result of gettimeofday().

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c

index 6c5c75cf5e6c3fea4a739c86bf1975adffceb262..9ed544f8958f322b8fc4f34835e10414921a211d 100644 (file)
@@ -901,11 +901,12 @@ static void vmw_event_fence_action_seq_passed(struct vmw_fence_action *action)
        spin_lock_irq(&dev->event_lock);
 
        if (likely(eaction->tv_sec != NULL)) {
-               struct timeval tv;
+               struct timespec64 ts;
 
-               do_gettimeofday(&tv);
-               *eaction->tv_sec = tv.tv_sec;
-               *eaction->tv_usec = tv.tv_usec;
+               ktime_get_ts64(&ts);
+               /* monotonic time, so no y2038 overflow */
+               *eaction->tv_sec = ts.tv_sec;
+               *eaction->tv_usec = ts.tv_nsec / NSEC_PER_USEC;
        }
 
        drm_send_event_locked(dev, eaction->event);