ACK: [SRU][Bionic] drm/vmwgfx: use monotonic event timestamps

Connor Kuehl connor.kuehl at canonical.com
Wed Jun 26 19:08:40 UTC 2019


On 6/20/19 5:26 PM, Eric Desrochers wrote:
> From: Arnd Bergmann <arnd at arndb.de>
> 
> BugLink: https://launchpad.net/bugs/1832138
> 
> 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 at arndb.de>
> Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
> (cherry picked from commit 37efe80ce85f76b3b30d7b4ea40550e6a5a5b71a)
> Signed-off-by: Eric Desrochers <eric.desrochers at canonical.com>
> Signed-off-by: Daniel van Vugt <daniel.van.vugt at canonical.com>

Acked-by: Connor Kuehl <connor.kuehl at canonical.com>

> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> index d6b1c509ae01..55214d0da66e 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
> @@ -897,11 +897,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);
> 


-- 
Connor
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pEpkey.asc
Type: application/pgp-keys
Size: 5950 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20190626/b8396414/attachment-0001.key>


More information about the kernel-team mailing list