drm/vgem: Use ww_mutex_(un)lock even with a NULL context

v2: use resv->lock instead of resv->lock.base (Christian König)

Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Maarten Lankhorst <dev@mblankhorst.nl>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle@amd.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1480601214-26583-2-git-send-email-nhaehnle@gmail.com

diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
index 488909a21ed89d49c9ee1dade3cdffd6ac60f53b..9cb00a5d5d08ca0fab86be865f321a223c01d1cc 100644 (file)
--- a/drivers/gpu/drm/vgem/vgem_fence.c
+++ b/drivers/gpu/drm/vgem/vgem_fence.c
@@ -191,12 +191,12 @@ int vgem_fence_attach_ioctl(struct drm_device *dev,
 
        /* Expose the fence via the dma-buf */
        ret = 0;
-       mutex_lock(&resv->lock.base);
+       ww_mutex_lock(&resv->lock, NULL);
        if (arg->flags & VGEM_FENCE_WRITE)
                reservation_object_add_excl_fence(resv, fence);
        else if ((ret = reservation_object_reserve_shared(resv)) == 0)
                reservation_object_add_shared_fence(resv, fence);
-       mutex_unlock(&resv->lock.base);
+       ww_mutex_unlock(&resv->lock);
 
        /* Record the fence in our idr for later signaling */
        if (ret == 0) {