projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
949f088
)
drm/vgem: Use ww_mutex_(un)lock even with a NULL context
author
Nicolai Hähnle
<Nicolai.Haehnle@amd.com>
Thu, 1 Dec 2016 14:06:44 +0000
(15:06 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 2 Dec 2016 16:15:20 +0000
(17:15 +0100)
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
drivers/gpu/drm/vgem/vgem_fence.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/vgem/vgem_fence.c
b/drivers/gpu/drm/vgem/vgem_fence.c
index
488909a
..
9cb00a5
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) {