From: Sergey Senozhatsky <senozhatsky@chromium.org>
To: Hans Verkuil <hans.verkuil@cisco.com>,
Tomasz Figa <tfiga@chromium.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Kyungmin Park <kyungmin.park@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Pawel Osciak <posciak@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [RFC][PATCHv2 11/12] videobuf2: add begin/end cpu_access callbacks to dma-sg
Date: Tue, 4 Feb 2020 11:56:40 +0900 [thread overview]
Message-ID: <20200204025641.218376-12-senozhatsky@chromium.org> (raw)
In-Reply-To: <20200204025641.218376-1-senozhatsky@chromium.org>
Provide begin_cpu_access() and end_cpu_access() dma_buf_ops
callbacks for cache synchronisation on exported buffers.
V4L2_FLAG_MEMORY_NON_CONSISTENT has no effect on dma-sg buffers.
dma-sg allocates memory using the page allocator directly, so
there is no memory consistency guarantee.
Change-Id: Ia0d9d72a8c2a9fe3264ac148f59201573289ed2c
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
.../media/common/videobuf2/videobuf2-dma-sg.c | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index 6db60e9d5183..bfc99a0cb7b9 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -470,6 +470,26 @@ static void vb2_dma_sg_dmabuf_ops_release(struct dma_buf *dbuf)
vb2_dma_sg_put(dbuf->priv);
}
+static int vb2_dma_sg_dmabuf_ops_begin_cpu_access(struct dma_buf *dbuf,
+ enum dma_data_direction direction)
+{
+ struct vb2_dma_sg_buf *buf = dbuf->priv;
+ struct sg_table *sgt = buf->dma_sgt;
+
+ dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+ return 0;
+}
+
+static int vb2_dma_sg_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,
+ enum dma_data_direction direction)
+{
+ struct vb2_dma_sg_buf *buf = dbuf->priv;
+ struct sg_table *sgt = buf->dma_sgt;
+
+ dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+ return 0;
+}
+
static void *vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf)
{
struct vb2_dma_sg_buf *buf = dbuf->priv;
@@ -488,6 +508,8 @@ static const struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
.detach = vb2_dma_sg_dmabuf_ops_detach,
.map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
.unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
+ .begin_cpu_access = vb2_dma_sg_dmabuf_ops_begin_cpu_access,
+ .end_cpu_access = vb2_dma_sg_dmabuf_ops_end_cpu_access,
.vmap = vb2_dma_sg_dmabuf_ops_vmap,
.mmap = vb2_dma_sg_dmabuf_ops_mmap,
.release = vb2_dma_sg_dmabuf_ops_release,
--
2.25.0.341.g760bfbb309-goog
next prev parent reply other threads:[~2020-02-04 2:57 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 2:56 [RFC][PATCHv2 00/12] Implement V4L2_BUF_FLAG_NO_CACHE_* flags Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 01/12] videobuf2: add cache management members Sergey Senozhatsky
2020-02-19 8:05 ` Hans Verkuil
2020-02-19 8:16 ` Sergey Senozhatsky
2020-02-19 8:27 ` Hans Verkuil
2020-02-04 2:56 ` [RFC][PATCHv2 02/12] videobuf2: handle V4L2 buffer cache flags Sergey Senozhatsky
2020-02-05 8:13 ` Sergey Senozhatsky
2020-02-19 8:07 ` Hans Verkuil
2020-02-19 8:13 ` Sergey Senozhatsky
2020-02-19 8:25 ` Hans Verkuil
2020-02-19 8:46 ` Hans Verkuil
2020-02-04 2:56 ` [RFC][PATCHv2 03/12] videobuf2: add V4L2_FLAG_MEMORY_NON_CONSISTENT flag Sergey Senozhatsky
2020-02-13 7:08 ` Tomasz Figa
2020-02-19 8:19 ` Hans Verkuil
2020-02-19 8:56 ` Hans Verkuil
2020-02-25 7:45 ` Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 04/12] videobuf2: add queue memory consistency parameter Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 05/12] videobuf2: handle V4L2_FLAG_MEMORY_NON_CONSISTENT flag Sergey Senozhatsky
2020-02-19 8:25 ` Hans Verkuil
2020-02-19 8:59 ` Sergey Senozhatsky
2020-02-19 9:04 ` Hans Verkuil
2020-02-19 8:48 ` Hans Verkuil
2020-02-19 9:05 ` Sergey Senozhatsky
2020-02-19 9:11 ` Hans Verkuil
2020-02-04 2:56 ` [RFC][PATCHv2 06/12] videobuf2: factor out planes prepare/finish functions Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 07/12] videobuf2: do not sync caches when we are allowed not to Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 08/12] videobuf2: check ->synced flag in prepare() and finish() Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 09/12] videobuf2: let user-space know if driver supports cache hints Sergey Senozhatsky
2020-02-19 8:33 ` Hans Verkuil
2020-02-19 8:45 ` Sergey Senozhatsky
2020-02-19 8:56 ` Hans Verkuil
2020-02-04 2:56 ` [RFC][PATCHv2 10/12] videobuf2: add begin/end cpu_access callbacks to dma-contig Sergey Senozhatsky
2020-02-04 2:56 ` Sergey Senozhatsky [this message]
2020-02-19 8:35 ` [RFC][PATCHv2 11/12] videobuf2: add begin/end cpu_access callbacks to dma-sg Hans Verkuil
2020-02-19 8:42 ` Sergey Senozhatsky
2020-02-04 2:56 ` [RFC][PATCHv2 12/12] videobuf2: don't test db_attach in dma-contig prepare and finish Sergey Senozhatsky
2020-02-19 8:53 ` [RFC][PATCHv2 00/12] Implement V4L2_BUF_FLAG_NO_CACHE_* flags Hans Verkuil
2020-02-26 11:20 ` Sergey Senozhatsky
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=20200204025641.218376-12-senozhatsky@chromium.org \
--to=senozhatsky@chromium.org \
--cc=hans.verkuil@cisco.com \
--cc=kyungmin.park@samsung.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=posciak@chromium.org \
--cc=sakari.ailus@iki.fi \
--cc=tfiga@chromium.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;
as well as URLs for NNTP newsgroup(s).