From: Nicolai Hähnle <nicolai.haeh...@amd.com>

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

Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Maarten Lankhorst <d...@mblankhorst.nl>
Cc: Daniel Vetter <dan...@ffwll.ch>
Cc: Chris Wilson <ch...@chris-wilson.co.uk>
Cc: dri-de...@lists.freedesktop.org
Signed-off-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
 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 488909a..9cb00a5 100644
--- 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) {
-- 
2.7.4

Reply via email to