From: Sumit Semwal <sumit.semwal@ti.com>
To: <dri-devel@lists.freedesktop.org>,
<linaro-mm-sig@lists.linaro.org>, <linux-media@vger.kernel.org>
Cc: Sumit Semwal <sumit.semwal@ti.com>
Subject: [PATCH] dma-buf: add dma_data_direction to unmap dma_buf_op
Date: Fri, 27 Jan 2012 15:04:53 +0530 [thread overview]
Message-ID: <1327656893-14338-1-git-send-email-sumit.semwal@ti.com> (raw)
Some exporters may use DMA map/unmap APIs in dma-buf ops, which require
enum dma_data_direction while unmapping.
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>
---
drivers/base/Kconfig | 2 +-
drivers/base/dma-buf.c | 7 +++++--
include/linux/dma-buf.h | 8 +++++---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 7be9f79..5edc5db 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -179,7 +179,7 @@ config GENERIC_CPU_DEVICES
source "drivers/base/regmap/Kconfig"
config DMA_SHARED_BUFFER
- bool
+ bool "Temporary mechanism to enable build of dma-buf"
default n
select ANON_INODES
depends on EXPERIMENTAL
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index 8afe2dd..c9a945f 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -271,16 +271,19 @@ EXPORT_SYMBOL_GPL(dma_buf_map_attachment);
* dma_buf_ops.
* @attach: [in] attachment to unmap buffer from
* @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,
- struct sg_table *sg_table)
+ struct sg_table *sg_table,
+ enum dma_data_direction direction)
{
if (WARN_ON(!attach || !attach->dmabuf || !sg_table))
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);
mutex_unlock(&attach->dmabuf->lock);
}
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index 86f6241..847b026 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -63,7 +63,8 @@ struct dma_buf_ops {
struct sg_table * (*map_dma_buf)(struct dma_buf_attachment *,
enum dma_data_direction);
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
* 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 *,
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
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,
- struct sg_table *sg)
+ struct sg_table *sg, enum dma_data_direction write)
{
return;
}
--
1.7.5.4
next reply other threads:[~2012-01-27 9:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-27 9:34 Sumit Semwal [this message]
2012-01-27 9:36 ` [PATCH] dma-buf: add dma_data_direction to unmap dma_buf_op Semwal, Sumit
-- strict thread matches above, loose matches on Subject: below --
2012-01-27 9:43 Sumit Semwal
2012-01-27 15:49 ` Daniel Vetter
2012-01-30 14:19 ` Laurent Pinchart
[not found] ` <CAB2ybb8RX5Sy7-s4-X2cLC9HcoTmsn_miYu0HysjHSU4aZ4BBw@mail.gmail.com>
2012-01-31 9:42 ` Laurent Pinchart
2012-01-31 10:36 ` Daniel Vetter
2012-02-02 10:04 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327656893-14338-1-git-send-email-sumit.semwal@ti.com \
--to=sumit.semwal@ti.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox