Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

dma-buf: don't hold the mutex around map/unmap calls

Browse Source 
The mutex protects the attachment list and hence needs to be held
around the callbakc to the exporters (optional) attach/detach
functions.

Holding the mutex around the map/unmap calls doesn't protect any
dma_buf state. Exporters need to properly protect any of their own
state anyway (to protect against calls from their own interfaces).
So this only makes the locking messier (and lockdep easier to anger).

Therefore let's just drop this.

v2: Rebased on top of latest dma-buf-next git.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Rob Clark <rob.clark@linaro.org>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
This commit is contained in:
Daniel Vetter 2012-03-19 00:34:25 +01:00 committed by Sumit Semwal
parent f9a24d1ac9
commit 6b607e3a65
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/base/dma-buf.c
View File

@ -258,9 +258,7 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach,
if (WARN_ON(!attach || !attach->dmabuf)) if (WARN_ON(!attach || !attach->dmabuf))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
mutex_lock(&attach->dmabuf->lock);
sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction); sg_table = attach->dmabuf->ops->map_dma_buf(attach, direction);
mutex_unlock(&attach->dmabuf->lock);
return sg_table; return sg_table;
} }
@ -282,10 +280,7 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
if (WARN_ON(!attach || !attach->dmabuf || !sg_table)) if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
return; return;
mutex_lock(&attach->dmabuf->lock);
attach->dmabuf->ops->unmap_dma_buf(attach, sg_table, attach->dmabuf->ops->unmap_dma_buf(attach, sg_table,
direction); direction);
mutex_unlock(&attach->dmabuf->lock);
} }
EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment); EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment);

2
include/linux/dma-buf.h
View File

@ -88,7 +88,7 @@ struct dma_buf {
struct file *file; struct file *file;
struct list_head attachments; struct list_head attachments;
const struct dma_buf_ops *ops; const struct dma_buf_ops *ops;
/* mutex to serialize list manipulation and other ops */ /* mutex to serialize list manipulation and attach/detach */
struct mutex lock; struct mutex lock;
void *priv; void *priv;
}; };