linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 12/12] videobuf2: don't test db_attach in dma-contig prepare and finish
Date: Tue,  4 Feb 2020 11:56:41 +0900	[thread overview]
Message-ID: <20200204025641.218376-13-senozhatsky@chromium.org> (raw)
In-Reply-To: <20200204025641.218376-1-senozhatsky@chromium.org>

We moved cache management decision making to the upper layer and
rely on buffer's need_cache_sync flags and videobuf2 core. If the
upper layer (core) has decided to invoke ->prepare() or ->finish()
then we must sync.

For DMABUF ->need_cache_sync_on_prepare and ->need_cache_sync_on_flush
are always false so videobuf core does not call ->prepare() and
->finish() on such buffers.

Additionally, scratch the DMABUF comment.

Change-Id: I8f6c0b246ccb63f775dcf7881dd5f848c38e7604
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 drivers/media/common/videobuf2/videobuf2-dma-contig.c | 6 ++----
 drivers/media/common/videobuf2/videobuf2-dma-sg.c     | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
index a387260fb321..6ea0961149d7 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
@@ -100,8 +100,7 @@ static void vb2_dc_prepare(void *buf_priv)
 	struct vb2_dc_buf *buf = buf_priv;
 	struct sg_table *sgt = buf->dma_sgt;
 
-	/* DMABUF exporter will flush the cache for us */
-	if (!sgt || buf->db_attach)
+	if (!sgt)
 		return;
 
 	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
@@ -113,8 +112,7 @@ static void vb2_dc_finish(void *buf_priv)
 	struct vb2_dc_buf *buf = buf_priv;
 	struct sg_table *sgt = buf->dma_sgt;
 
-	/* DMABUF exporter will flush the cache for us */
-	if (!sgt || buf->db_attach)
+	if (!sgt)
 		return;
 
 	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index bfc99a0cb7b9..1fd25eda0bf2 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -198,10 +198,6 @@ static void vb2_dma_sg_prepare(void *buf_priv)
 	struct vb2_dma_sg_buf *buf = buf_priv;
 	struct sg_table *sgt = buf->dma_sgt;
 
-	/* DMABUF exporter will flush the cache for us */
-	if (buf->db_attach)
-		return;
-
 	dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->orig_nents,
 			       buf->dma_dir);
 }
@@ -211,10 +207,6 @@ static void vb2_dma_sg_finish(void *buf_priv)
 	struct vb2_dma_sg_buf *buf = buf_priv;
 	struct sg_table *sgt = buf->dma_sgt;
 
-	/* DMABUF exporter will flush the cache for us */
-	if (buf->db_attach)
-		return;
-
 	dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
 }
 
-- 
2.25.0.341.g760bfbb309-goog


  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 ` [RFC][PATCHv2 11/12] videobuf2: add begin/end cpu_access callbacks to dma-sg Sergey Senozhatsky
2020-02-19  8:35   ` Hans Verkuil
2020-02-19  8:42     ` Sergey Senozhatsky
2020-02-04  2:56 ` Sergey Senozhatsky [this message]
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-13-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).