[Intel-gfx] [PATCH] drm/vgem: Remember to offset relative timeouts to mod_timer() by jiffies

[Daniel Vetter]

On Mon, Jul 18, 2016 at 10:31:18AM +0100, Chris Wilson wrote:
> mod_timer() takes an absolute jiffie value, not a relative timeout and
> quietly fixup the missed ret=0 otherwise gcc just always returns that
> the fence timed out.
> 
> Testcase: igt/vgem_basic/fence
> Fixes: 407779848445 ("drm/vgem: Attach sw fences to exported vGEM dma-buf")
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>

Oops. Applied to drm-misc.
-Daniel

> ---
>  drivers/gpu/drm/vgem/vgem_fence.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
> index e77b52208699..892417ba2622 100644
> --- a/drivers/gpu/drm/vgem/vgem_fence.c
> +++ b/drivers/gpu/drm/vgem/vgem_fence.c
> @@ -107,7 +107,7 @@ static struct fence *vgem_fence_create(struct vgem_file *vfile,
>  	setup_timer(&fence->timer, vgem_fence_timeout, (unsigned long)fence);
>  
>  	/* We force the fence to expire within 10s to prevent driver hangs */
> -	mod_timer(&fence->timer, VGEM_FENCE_TIMEOUT);
> +	mod_timer(&fence->timer, jiffies + VGEM_FENCE_TIMEOUT);
>  
>  	return &fence->base;
>  }
> @@ -240,7 +240,7 @@ int vgem_fence_signal_ioctl(struct drm_device *dev,
>  	struct vgem_file *vfile = file->driver_priv;
>  	struct drm_vgem_fence_signal *arg = data;
>  	struct fence *fence;
> -	int ret;
> +	int ret = 0;
>  
>  	if (arg->flags)
>  		return -EINVAL;
> -- 
> 2.8.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch