From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Tomasz Figa <tfiga@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [PATCH v6 10/14] videobuf2: add begin/end cpu_access callbacks to dma-contig
Date: Fri, 15 May 2020 01:01:49 +0900 [thread overview]
Message-ID: <20200514160153.3646-11-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <20200514160153.3646-1-sergey.senozhatsky@gmail.com>
From: Sergey Senozhatsky <senozhatsky@chromium.org>
Provide begin_cpu_access() and end_cpu_access() callbacks for
cache synchronisation on exported buffers.
The patch also adds a new helper function - vb2_dc_buffer_consistent(),
which returns true is if the buffer is consistent (DMA_ATTR_NON_CONSISTENT
bit cleared), so then we don't need to sync anything.
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
.../common/videobuf2/videobuf2-dma-contig.c | 35 +++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index d3a3ee5b597b..6787e2cb905e 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -42,6 +42,11 @@ struct vb2_dc_buf {
struct dma_buf_attachment *db_attach;
};
+static inline bool vb2_dc_buffer_consistent(unsigned long attr)
+{
+ return !(attr & DMA_ATTR_NON_CONSISTENT);
+}
+
/*********************************************/
/* scatterlist table functions */
/*********************************************/
@@ -335,6 +340,34 @@ static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf)
vb2_dc_put(dbuf->priv);
}
+static int
+vb2_dc_dmabuf_ops_begin_cpu_access(struct dma_buf *dbuf,
+ enum dma_data_direction direction)
+{
+ struct vb2_dc_buf *buf = dbuf->priv;
+ struct sg_table *sgt = buf->dma_sgt;
+
+ if (vb2_dc_buffer_consistent(buf->attrs))
+ return 0;
+
+ dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+ return 0;
+}
+
+static int
+vb2_dc_dmabuf_ops_end_cpu_access(struct dma_buf *dbuf,
+ enum dma_data_direction direction)
+{
+ struct vb2_dc_buf *buf = dbuf->priv;
+ struct sg_table *sgt = buf->dma_sgt;
+
+ if (vb2_dc_buffer_consistent(buf->attrs))
+ return 0;
+
+ dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+ return 0;
+}
+
static void *vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf)
{
struct vb2_dc_buf *buf = dbuf->priv;
@@ -353,6 +386,8 @@ static const struct dma_buf_ops vb2_dc_dmabuf_ops = {
.detach = vb2_dc_dmabuf_ops_detach,
.map_dma_buf = vb2_dc_dmabuf_ops_map,
.unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
+ .begin_cpu_access = vb2_dc_dmabuf_ops_begin_cpu_access,
+ .end_cpu_access = vb2_dc_dmabuf_ops_end_cpu_access,
.vmap = vb2_dc_dmabuf_ops_vmap,
.mmap = vb2_dc_dmabuf_ops_mmap,
.release = vb2_dc_dmabuf_ops_release,
--
2.26.2
next prev parent reply other threads:[~2020-05-14 16:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 16:01 [PATCH v6 00/14] Implement V4L2_BUF_FLAG_NO_CACHE_* flags Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 01/14] videobuf2: use explicit unsigned int in vb2_queue Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 02/14] videobuf2: add cache management members Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 03/14] videobuf2: handle V4L2 buffer cache flags Sergey Senozhatsky
2020-06-02 9:51 ` Hans Verkuil
2020-06-02 10:18 ` Sergey Senozhatsky
2020-06-02 10:27 ` Hans Verkuil
2020-06-02 12:10 ` Sergey Senozhatsky
2020-06-02 12:21 ` Hans Verkuil
2020-06-02 12:22 ` Tomasz Figa
2020-06-02 12:24 ` Hans Verkuil
2020-06-04 4:36 ` Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 04/14] videobuf2: add V4L2_FLAG_MEMORY_NON_CONSISTENT flag Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 05/14] videobuf2: add queue memory consistency parameter Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 06/14] videobuf2: handle V4L2_FLAG_MEMORY_NON_CONSISTENT flag Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 07/14] videobuf2: factor out planes prepare/finish functions Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 08/14] videobuf2: do not sync caches when we are allowed not to Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 09/14] videobuf2: check ->synced flag in prepare() and finish() Sergey Senozhatsky
2020-05-14 16:01 ` Sergey Senozhatsky [this message]
2020-05-14 16:01 ` [PATCH v6 11/14] videobuf2: add begin/end cpu_access callbacks to dma-sg Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 12/14] videobuf2: don't test db_attach in dma-contig prepare and finish Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 13/14] videobuf2: remove redundant if-statement Sergey Senozhatsky
2020-05-14 16:01 ` [PATCH v6 14/14] media: vivid: add cache_hints module param Sergey Senozhatsky
2020-05-18 15:18 ` [PATCH v6 00/14] Implement V4L2_BUF_FLAG_NO_CACHE_* flags Hans Verkuil
2020-05-19 8:06 ` 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=20200514160153.3646-11-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=senozhatsky@chromium.org \
--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).