forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dma-buf: add dma_data_direction to unmap dma_buf_op

Browse source 
Some exporters may use DMA map/unmap APIs in dma-buf ops, which require
enum dma_data_direction for both map and unmap operations.

Thus, the unmap dma_buf_op also needs to have enum dma_data_direction as
a parameter.

Reported-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
This commit is contained in:
Sumit Semwal 2012-01-27 15:09:27 +05:30
commit 33ea2dcb39
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/base/dma-buf.c
View file

@ -271,16 +271,19 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment);
* dma_buf_ops. * dma_buf_ops.
* @attach: [in] attachment to unmap buffer from * @attach: [in] attachment to unmap buffer from
* @sg_table: [in] scatterlist info of the buffer to unmap * @sg_table: [in] scatterlist info of the buffer to unmap
* @direction: [in] direction of DMA transfer
* *
*/ */
void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
struct sg_table *sg_table) struct sg_table *sg_table,
enum dma_data_direction direction)
{ {
if (WARN_ON(!attach || !attach->dmabuf || !sg_table)) if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
return; return;
mutex_lock(&attach->dmabuf->lock); mutex_lock(&attach->dmabuf->lock);
attach->dmabuf->ops->unmap_dma_buf(attach, sg_table); attach->dmabuf->ops->unmap_dma_buf(attach, sg_table,
direction);
mutex_unlock(&attach->dmabuf->lock); mutex_unlock(&attach->dmabuf->lock);
} }

8
include/linux/dma-buf.h
View file

@ -63,7 +63,8 @@ struct dma_buf_ops {
struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *, struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *,
enum dma_data_direction); enum dma_data_direction);
void (*unmap_dma_buf)(struct dma_buf_attachment *, void (*unmap_dma_buf)(struct dma_buf_attachment *,
struct sg_table *); struct sg_table *,
enum dma_data_direction);
/* TODO: Add try_map_dma_buf version, to return immed with -EBUSY /* TODO: Add try_map_dma_buf version, to return immed with -EBUSY
* if the call would block. * if the call would block.
*/ */
@ -122,7 +123,8 @@ void dma_buf_put(struct dma_buf *dmabuf);
struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *, struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *,
enum dma_data_direction); enum dma_data_direction);
void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *); void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *,
enum dma_data_direction);
#else #else
static inline struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, static inline struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf,
@ -166,7 +168,7 @@ static inline struct sg_table *dma_buf_map_attachment(
} }
static inline void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, static inline void dma_buf_unmap_attachment(struct dma_buf_attachment *attach,
struct sg_table *sg) struct sg_table *sg, enum dma_data_direction dir)
{ {
return; return;
} }