diff options
| author | Nicolai Hähnle <[email protected]> | 2016-12-01 15:06:44 +0100 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2016-12-02 17:15:20 +0100 |
| commit | ad1231080be5a5cb34bbecf08fa3fea50209ef94 (patch) | |
| tree | c51848ab61bbed997ec5bc46b685583a94eb547a | |
| parent | 949f08862d662f17b9d2929c6afb2d4e8f5d50cb (diff) | |
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 <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Chris Wilson <[email protected]>
Cc: [email protected]
Signed-off-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/vgem/vgem_fence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c index 488909a21ed8..9cb00a5d5d08 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) { |