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][PATCH 05/15] videobuf2: handle V4L2_FLAG_MEMORY_NON_CONSISTENT in REQBUFS
Date: Tue, 17 Dec 2019 12:20:24 +0900 [thread overview]
Message-ID: <20191217032034.54897-6-senozhatsky@chromium.org> (raw)
In-Reply-To: <20191217032034.54897-1-senozhatsky@chromium.org>
This patch lets user-space to request a non-consistent memory
allocation during REQBUFS ioctl call. We use one bit of a
->reserved[1] member of struct v4l2_requestbuffers, which is
now renamed to ->flags.
There is just 1 four-byte reserved area in v4l2_requestbuffers
struct, therefore for backward compatibility ->reserved and
->flags were put into anonymous union.
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 14 ++++++++++++--
drivers/media/common/videobuf2/videobuf2-v4l2.c | 14 ++++++++++++--
drivers/media/v4l2-core/v4l2-ioctl.c | 3 ---
include/uapi/linux/videodev2.h | 5 ++++-
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
index d0c643db477a..9b69a61d9fd4 100644
--- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
+++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
@@ -112,10 +112,20 @@ aborting or finishing any DMA in progress, an implicit
``V4L2_MEMORY_MMAP`` and ``type`` set to the buffer type. This will
free any previously allocated buffers, so this is typically something
that will be done at the start of the application.
- * - __u32
+ * - union
+ - (anonymous)
+ * -
+ - __u32
+ - ``flags``\ [1]
+ - Specifies additional buffer management attributes. E.g. when
+ ``V4L2_FLAG_MEMORY_NON_CONSISTENT`` set vb2 backends may be allocated
+ in non-consistent memory.
+ * -
+ - __u32
- ``reserved``\ [1]
- A place holder for future extensions. Drivers and applications
- must set the array to zero.
+ must set the array to zero, unless application wants to specify
+ buffer management ``flags``.
.. tabularcolumns:: |p{6.1cm}|p{2.2cm}|p{8.7cm}|
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index f1e88c9398c7..0eabb589684f 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -693,9 +693,15 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
{
int ret = vb2_verify_memory_type(q, req->memory, req->type);
+ bool consistent = true;
+
+ if (req->flags & V4L2_FLAG_MEMORY_NON_CONSISTENT)
+ consistent = false;
fill_buf_caps(q, &req->capabilities);
- return ret ? ret : vb2_core_reqbufs(q, req->memory, true, &req->count);
+ if (ret)
+ return ret;
+ return vb2_core_reqbufs(q, req->memory, consistent, &req->count);
}
EXPORT_SYMBOL_GPL(vb2_reqbufs);
@@ -939,13 +945,17 @@ int vb2_ioctl_reqbufs(struct file *file, void *priv,
{
struct video_device *vdev = video_devdata(file);
int res = vb2_verify_memory_type(vdev->queue, p->memory, p->type);
+ bool consistent = true;
fill_buf_caps(vdev->queue, &p->capabilities);
if (res)
return res;
if (vb2_queue_is_busy(vdev, file))
return -EBUSY;
- res = vb2_core_reqbufs(vdev->queue, p->memory, true, &p->count);
+ if (p->flags & V4L2_FLAG_MEMORY_NON_CONSISTENT)
+ consistent = false;
+
+ res = vb2_core_reqbufs(vdev->queue, p->memory, consistent, &p->count);
/* If count == 0, then the owner has released all buffers and he
is no longer owner of the queue. Otherwise we have a new owner. */
if (res == 0)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 003b7422aeef..225d06819bce 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1973,9 +1973,6 @@ static int v4l_reqbufs(const struct v4l2_ioctl_ops *ops,
if (ret)
return ret;
-
- CLEAR_AFTER_FIELD(p, capabilities);
-
return ops->vidioc_reqbufs(file, fh, p);
}
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index d352997f2b62..73a4854f71bd 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -919,7 +919,10 @@ struct v4l2_requestbuffers {
__u32 type; /* enum v4l2_buf_type */
__u32 memory; /* enum v4l2_memory */
__u32 capabilities;
- __u32 reserved[1];
+ union {
+ __u32 flags;
+ __u32 reserved[1];
+ };
};
/* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
--
2.24.1.735.g03f4e72817-goog
next prev parent reply other threads:[~2019-12-17 3:21 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 3:20 [RFC][PATCH 00/15] Implement V4L2_BUF_FLAG_NO_CACHE_* flags Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 01/15] videobuf2: add cache management members Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 02/15] videobuf2: handle V4L2 buffer cache flags Sergey Senozhatsky
2020-01-10 10:24 ` Hans Verkuil
2020-01-22 1:39 ` Sergey Senozhatsky
2020-01-22 2:53 ` Sergey Senozhatsky
2020-01-28 4:35 ` Tomasz Figa
2019-12-17 3:20 ` [RFC][PATCH 03/15] videobuf2: add V4L2_FLAG_MEMORY_NON_CONSISTENT flag Sergey Senozhatsky
2020-01-10 9:36 ` Hans Verkuil
2020-01-10 9:46 ` Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 04/15] videobuf2: add queue memory consistency parameter Sergey Senozhatsky
2020-01-10 9:47 ` Hans Verkuil
2020-01-22 2:05 ` Sergey Senozhatsky
2020-01-23 11:02 ` Hans Verkuil
2020-01-24 2:04 ` Sergey Senozhatsky
2019-12-17 3:20 ` Sergey Senozhatsky [this message]
2020-01-10 9:55 ` [RFC][PATCH 05/15] videobuf2: handle V4L2_FLAG_MEMORY_NON_CONSISTENT in REQBUFS Hans Verkuil
2020-01-22 2:18 ` Sergey Senozhatsky
2020-01-22 3:48 ` Sergey Senozhatsky
2020-01-23 11:08 ` Hans Verkuil
2020-01-28 4:45 ` Tomasz Figa
2020-01-28 8:38 ` Hans Verkuil
2019-12-17 3:20 ` [RFC][PATCH 06/15] videobuf2: handle V4L2_FLAG_MEMORY_NON_CONSISTENT in CREATE_BUFS Sergey Senozhatsky
2020-01-10 9:59 ` Hans Verkuil
2020-01-23 3:41 ` Sergey Senozhatsky
2020-01-23 11:41 ` Hans Verkuil
2020-01-24 1:28 ` Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 07/15] videobuf2: factor out planes prepare/finish functions Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 08/15] videobuf2: do not sync caches when we are allowed not to Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 09/15] videobuf2: check ->synced flag in prepare() and finish() Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 10/15] videobuf2: let user-space know when driver supports cache hints Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 11/15] videobuf2: add begin/end cpu_access callbacks to dma-contig Sergey Senozhatsky
2019-12-17 3:20 ` [RFC][PATCH 12/15] videobuf2: add begin/end cpu_access callbacks to dma-sg Sergey Senozhatsky
2020-01-10 10:13 ` Hans Verkuil
2020-01-22 6:37 ` Sergey Senozhatsky
2020-01-28 4:38 ` Tomasz Figa
2020-01-28 8:36 ` Hans Verkuil
2020-01-30 11:02 ` Tomasz Figa
2020-01-30 12:18 ` Hans Verkuil
2020-02-03 10:04 ` Tomasz Figa
2020-02-04 2:50 ` Sergey Senozhatsky
2020-02-06 8:51 ` Tomasz Figa
2019-12-17 3:20 ` [RFC][PATCH 13/15] videobuf2: do not sync buffers for DMABUF queues Sergey Senozhatsky
2020-01-10 10:30 ` Hans Verkuil
2020-01-22 5:05 ` Sergey Senozhatsky
2020-01-23 11:35 ` Hans Verkuil
2020-01-24 2:25 ` Sergey Senozhatsky
2020-01-24 7:32 ` Sergey Senozhatsky
2020-01-28 7:22 ` Tomasz Figa
2020-01-28 7:34 ` Sergey Senozhatsky
2020-01-28 7:19 ` Tomasz Figa
2020-01-28 8:47 ` Hans Verkuil
2019-12-17 3:20 ` [RFC][PATCH 14/15] videobuf2: don't test db_attach in dma-contig prepare and finish Sergey Senozhatsky
2020-01-10 10:32 ` Hans Verkuil
2019-12-17 3:20 ` [RFC][PATCH 15/15] videobuf2: don't test db_attach in dma-sg " Sergey Senozhatsky
2020-01-08 2:27 ` [RFC][PATCH 00/15] Implement V4L2_BUF_FLAG_NO_CACHE_* flags 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=20191217032034.54897-6-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).