* [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
@ 2019-04-04 8:16 Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Boris Brezillon
` (7 more replies)
0 siblings, 8 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
Hello,
This RFC follows the discussion started by Hans [1] a few months back.
It does not try to address all the problem reported in this thread but
instead focuses on the FMT and BUF(S) ioctls.
Note that my primary goal is to unify handling for multiplanar and
singleplanar formats and extend things to support the "single dmabuf
storing all pixel planes" issue.
This version received a bit more testing than the previous one (added
new tests to v4l2-compliance [2] to make sure EXT ioctls work as
expected and also checked that !ext -> ext wrappers work correctly by
running the old tests). Note that I'm not planning to post those
v4l-utils patches on the ML until we've settled down on the userspace
API, unless I'm explicitly asked to do so.
Right now I'm focusing on the case I was primarily interested in:
single dmabuf storing all pixel planes (each being at a different
offset), and it seems that patching the VB2 core to support that is
not a trivial task.
So here are a few questions for V4L/DMABUF experts:
- Can the same dmabuf be mapped several times. I think it's okay apart
from the extra/needless time spent doing cache maintenance
operations, but there might be issues if an IOMMU is involved
(duplicate mappings?). If it's not okay, then we need to find a
solution to only attach/map the DMABUF once when it's used for
several planes (this is what I tried to do here [3], but I'm not
entirely happy with the implementation and started to investigate
another approach here [4]).
- How should we pass the offset to drivers that were previously using
the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
case can be done in the core, but for an sg-table it's a bit more
complicated. Should drivers access this piece of information
directly from vb2_plane->dbuf_offset? And in that case, how do we
make sure drivers don't simply ignore the offset and assume it's
always zero?
Few words about the feedback I got from Brian and Nicolas on my v1:
- modifier field has been moved to v4l2_ext_format as suggested
- v4l2_timecode is still not present in v4l2_ext_buffer, but can be
added back thanks to the extra reserved space
- the ENUMFMT is left as is for now, because I think we want Maxime's
work on DRM/V4L format unification to land before reworking the
ioctl (exposing extra info about the format and not only the 4CC
code?). That also means that there's currently no way to know which
modifiers are supported
- EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
supported or not have not been added yet
Regards,
Boris
[1]https://www.mail-archive.com/linux-media@vger.kernel.org/msg135729.html
[2]https://github.com/bbrezillon/v4l-utils/commits/master
[3]https://github.com/bbrezillon/linux/commit/4882435f80b05a61827649d55cc0f0cee79680a7
[4]https://github.com/bbrezillon/linux/commit/a415216c6aaab2d51f0bd62270b994c8196ddd90
*** BLURB HERE ***
Boris Brezillon (6):
media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
media: v4l2: Extend pixel formats to unify single/multi-planar
handling (and more)
media: videobuf2: Expose helpers to implement the _ext_fmt and
_ext_buf hooks
media: mediabus: Add an helper to convert a ext_pix format to an
mbus_fmt
media: vivid: Convert the capture and output drivers to
EXT_FMT/EXT_BUF
media: vimc: Implement the ext_fmt and ext_buf hooks
Hans Verkuil (1):
media: v4l2: Add extended buffer operations
.../media/common/videobuf2/videobuf2-core.c | 2 +
.../media/common/videobuf2/videobuf2-v4l2.c | 534 +++++---
drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
.../media/platform/exynos4-is/fimc-capture.c | 2 +-
.../platform/exynos4-is/fimc-isp-video.c | 2 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
drivers/media/platform/exynos4-is/fimc-m2m.c | 4 +-
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +-
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 +-
.../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +-
.../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 +-
.../media/platform/qcom/camss/camss-video.c | 2 +-
drivers/media/platform/qcom/venus/vdec.c | 4 +-
drivers/media/platform/qcom/venus/venc.c | 4 +-
drivers/media/platform/rcar_fdp1.c | 4 +-
drivers/media/platform/rcar_jpu.c | 4 +-
drivers/media/platform/renesas-ceu.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 +-
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 +-
drivers/media/platform/ti-vpe/vpe.c | 4 +-
drivers/media/platform/vicodec/vicodec-core.c | 2 -
drivers/media/platform/vimc/vimc-capture.c | 65 +-
drivers/media/platform/vimc/vimc-common.c | 4 +-
drivers/media/platform/vimc/vimc-common.h | 2 +-
drivers/media/platform/vimc/vimc-core.c | 10 +-
drivers/media/platform/vivid/vivid-core.c | 36 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 171 +--
drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
.../media/platform/vivid/vivid-vid-common.c | 20 -
.../media/platform/vivid/vivid-vid-common.h | 2 -
drivers/media/platform/vivid/vivid-vid-out.c | 195 +--
drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
drivers/media/v4l2-core/v4l2-dev.c | 56 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 1141 +++++++++++++++--
drivers/staging/media/ipu3/ipu3-v4l2.c | 4 +-
.../media/rockchip/vpu/rockchip_vpu_enc.c | 4 +-
include/media/v4l2-ioctl.h | 77 +-
include/media/v4l2-mediabus.h | 22 +
include/media/videobuf2-core.h | 6 +-
include/media/videobuf2-v4l2.h | 26 +-
include/uapi/linux/videodev2.h | 211 +++
42 files changed, 1945 insertions(+), 739 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-11 7:59 ` Hans Verkuil
2019-04-04 8:16 ` [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more) Boris Brezillon
` (6 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
Support for multiplanar and singleplanar formats is mutually exclusive,
at least in practice. In our attempt to unify support for support for
mplane and !mplane in v4l, let's get rid of the
->vidioc_enum_fmt_{vid,out}_cap_mplane() hooks and call
->vidioc_enum_fmt_{vid,out}_cap() instead.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- None
---
drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 ++--
.../media/platform/exynos4-is/fimc-capture.c | 2 +-
.../platform/exynos4-is/fimc-isp-video.c | 2 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
drivers/media/platform/exynos4-is/fimc-m2m.c | 4 ++--
.../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 ++--
.../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++--
.../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 ++--
.../media/platform/qcom/camss/camss-video.c | 2 +-
drivers/media/platform/qcom/venus/vdec.c | 4 ++--
drivers/media/platform/qcom/venus/venc.c | 4 ++--
drivers/media/platform/rcar_fdp1.c | 4 ++--
drivers/media/platform/rcar_jpu.c | 4 ++--
drivers/media/platform/renesas-ceu.c | 2 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 ++--
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 ++--
drivers/media/platform/ti-vpe/vpe.c | 4 ++--
drivers/media/platform/vicodec/vicodec-core.c | 2 --
drivers/media/platform/vivid/vivid-core.c | 6 ++----
.../media/platform/vivid/vivid-vid-common.c | 20 ------------------
.../media/platform/vivid/vivid-vid-common.h | 2 --
drivers/media/v4l2-core/v4l2-dev.c | 2 --
drivers/media/v4l2-core/v4l2-ioctl.c | 21 ++++++++++---------
drivers/staging/media/ipu3/ipu3-v4l2.c | 4 ++--
.../media/rockchip/vpu/rockchip_vpu_enc.c | 4 ++--
include/media/v4l2-ioctl.h | 14 ++-----------
28 files changed, 51 insertions(+), 88 deletions(-)
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index f8020ebe9f05..c3b3af3c3b2f 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1174,7 +1174,7 @@ static const struct v4l2_file_operations cio2_v4l2_fops = {
static const struct v4l2_ioctl_ops cio2_v4l2_ioctl_ops = {
.vidioc_querycap = cio2_v4l2_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = cio2_v4l2_enum_fmt,
+ .vidioc_enum_fmt_vid_cap = cio2_v4l2_enum_fmt,
.vidioc_g_fmt_vid_cap_mplane = cio2_v4l2_g_fmt,
.vidioc_s_fmt_vid_cap_mplane = cio2_v4l2_s_fmt,
.vidioc_try_fmt_vid_cap_mplane = cio2_v4l2_try_fmt,
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index c757f5d98bcc..9e2914d3d8f9 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -562,8 +562,8 @@ static int gsc_m2m_s_selection(struct file *file, void *fh,
static const struct v4l2_ioctl_ops gsc_m2m_ioctl_ops = {
.vidioc_querycap = gsc_m2m_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = gsc_m2m_enum_fmt_mplane,
- .vidioc_enum_fmt_vid_out_mplane = gsc_m2m_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_cap = gsc_m2m_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_out = gsc_m2m_enum_fmt_mplane,
.vidioc_g_fmt_vid_cap_mplane = gsc_m2m_g_fmt_mplane,
.vidioc_g_fmt_vid_out_mplane = gsc_m2m_g_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = gsc_m2m_try_fmt_mplane,
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 3e9fcf4f8a13..649c3a5b4d03 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -1361,7 +1361,7 @@ static int fimc_cap_s_selection(struct file *file, void *fh,
static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = {
.vidioc_querycap = fimc_cap_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = fimc_cap_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_cap = fimc_cap_enum_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = fimc_cap_try_fmt_mplane,
.vidioc_s_fmt_vid_cap_mplane = fimc_cap_s_fmt_mplane,
.vidioc_g_fmt_vid_cap_mplane = fimc_cap_g_fmt_mplane,
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
index bb35a2017f21..ffe10a2ea6b0 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
@@ -551,7 +551,7 @@ static int isp_video_reqbufs(struct file *file, void *priv,
static const struct v4l2_ioctl_ops isp_video_ioctl_ops = {
.vidioc_querycap = isp_video_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = isp_video_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_cap = isp_video_enum_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = isp_video_try_fmt_mplane,
.vidioc_s_fmt_vid_cap_mplane = isp_video_s_fmt_mplane,
.vidioc_g_fmt_vid_cap_mplane = isp_video_g_fmt_mplane,
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 96f0a8a0dcae..b9c537d38a45 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -954,7 +954,7 @@ static int fimc_lite_s_selection(struct file *file, void *fh,
static const struct v4l2_ioctl_ops fimc_lite_ioctl_ops = {
.vidioc_querycap = fimc_lite_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = fimc_lite_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_cap = fimc_lite_enum_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = fimc_lite_try_fmt_mplane,
.vidioc_s_fmt_vid_cap_mplane = fimc_lite_s_fmt_mplane,
.vidioc_g_fmt_vid_cap_mplane = fimc_lite_g_fmt_mplane,
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index 61c8177409cf..278ab067e30f 100644
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -533,8 +533,8 @@ static int fimc_m2m_s_selection(struct file *file, void *fh,
static const struct v4l2_ioctl_ops fimc_m2m_ioctl_ops = {
.vidioc_querycap = fimc_m2m_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = fimc_m2m_enum_fmt_mplane,
- .vidioc_enum_fmt_vid_out_mplane = fimc_m2m_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_cap = fimc_m2m_enum_fmt_mplane,
+ .vidioc_enum_fmt_vid_out = fimc_m2m_enum_fmt_mplane,
.vidioc_g_fmt_vid_cap_mplane = fimc_m2m_g_fmt_mplane,
.vidioc_g_fmt_vid_out_mplane = fimc_m2m_g_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = fimc_m2m_try_fmt_mplane,
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index f761e4d8bf2a..3b199662cb34 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -536,8 +536,8 @@ static int mtk_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = {
.vidioc_querycap = mtk_jpeg_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = mtk_jpeg_enum_fmt_vid_cap,
- .vidioc_enum_fmt_vid_out_mplane = mtk_jpeg_enum_fmt_vid_out,
+ .vidioc_enum_fmt_vid_cap = mtk_jpeg_enum_fmt_vid_cap,
+ .vidioc_enum_fmt_vid_out = mtk_jpeg_enum_fmt_vid_out,
.vidioc_try_fmt_vid_cap_mplane = mtk_jpeg_try_fmt_vid_cap_mplane,
.vidioc_try_fmt_vid_out_mplane = mtk_jpeg_try_fmt_vid_out_mplane,
.vidioc_g_fmt_vid_cap_mplane = mtk_jpeg_g_fmt_vid_mplane,
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
index 7d15c06e9db9..f094d1030331 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
@@ -935,8 +935,8 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
static const struct v4l2_ioctl_ops mtk_mdp_m2m_ioctl_ops = {
.vidioc_querycap = mtk_mdp_m2m_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = mtk_mdp_m2m_enum_fmt_mplane_vid_cap,
- .vidioc_enum_fmt_vid_out_mplane = mtk_mdp_m2m_enum_fmt_mplane_vid_out,
+ .vidioc_enum_fmt_vid_cap = mtk_mdp_m2m_enum_fmt_mplane_vid_cap,
+ .vidioc_enum_fmt_vid_out = mtk_mdp_m2m_enum_fmt_mplane_vid_out,
.vidioc_g_fmt_vid_cap_mplane = mtk_mdp_m2m_g_fmt_mplane,
.vidioc_g_fmt_vid_out_mplane = mtk_mdp_m2m_g_fmt_mplane,
.vidioc_try_fmt_vid_cap_mplane = mtk_mdp_m2m_try_fmt_mplane,
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index d022c65bb34c..1d922b8dfb6b 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -1444,8 +1444,8 @@ const struct v4l2_ioctl_ops mtk_vdec_ioctl_ops = {
.vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_vdec_enum_fmt_vid_cap_mplane,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_vdec_enum_fmt_vid_out_mplane,
+ .vidioc_enum_fmt_vid_cap = vidioc_vdec_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_fmt_vid_out = vidioc_vdec_enum_fmt_vid_out_mplane,
.vidioc_enum_framesizes = vidioc_enum_framesizes,
.vidioc_querycap = vidioc_vdec_querycap,
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index c6b48b5925fb..6ee7ced96d84 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -725,8 +725,8 @@ const struct v4l2_ioctl_ops mtk_venc_ioctl_ops = {
.vidioc_dqbuf = vidioc_venc_dqbuf,
.vidioc_querycap = vidioc_venc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
.vidioc_enum_framesizes = vidioc_enum_framesizes,
.vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap_mplane,
diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
index 58aebe7114cd..1d50dfbbb762 100644
--- a/drivers/media/platform/qcom/camss/camss-video.c
+++ b/drivers/media/platform/qcom/camss/camss-video.c
@@ -703,7 +703,7 @@ static int video_s_input(struct file *file, void *fh, unsigned int input)
static const struct v4l2_ioctl_ops msm_vid_ioctl_ops = {
.vidioc_querycap = video_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = video_enum_fmt,
+ .vidioc_enum_fmt_vid_cap = video_enum_fmt,
.vidioc_g_fmt_vid_cap_mplane = video_g_fmt,
.vidioc_s_fmt_vid_cap_mplane = video_s_fmt,
.vidioc_try_fmt_vid_cap_mplane = video_try_fmt,
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 282de21cf2e1..2a47b9b8c5bc 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -491,8 +491,8 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd)
static const struct v4l2_ioctl_ops vdec_ioctl_ops = {
.vidioc_querycap = vdec_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vdec_enum_fmt,
- .vidioc_enum_fmt_vid_out_mplane = vdec_enum_fmt,
+ .vidioc_enum_fmt_vid_cap = vdec_enum_fmt,
+ .vidioc_enum_fmt_vid_out = vdec_enum_fmt,
.vidioc_s_fmt_vid_cap_mplane = vdec_s_fmt,
.vidioc_s_fmt_vid_out_mplane = vdec_s_fmt,
.vidioc_g_fmt_vid_cap_mplane = vdec_g_fmt,
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 32cff294582f..406a47923996 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -616,8 +616,8 @@ static int venc_enum_frameintervals(struct file *file, void *fh,
static const struct v4l2_ioctl_ops venc_ioctl_ops = {
.vidioc_querycap = venc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = venc_enum_fmt,
- .vidioc_enum_fmt_vid_out_mplane = venc_enum_fmt,
+ .vidioc_enum_fmt_vid_cap = venc_enum_fmt,
+ .vidioc_enum_fmt_vid_out = venc_enum_fmt,
.vidioc_s_fmt_vid_cap_mplane = venc_s_fmt,
.vidioc_s_fmt_vid_out_mplane = venc_s_fmt,
.vidioc_g_fmt_vid_cap_mplane = venc_g_fmt,
diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
index 6bda1eee9170..6e6471c37984 100644
--- a/drivers/media/platform/rcar_fdp1.c
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -1730,8 +1730,8 @@ static const char * const fdp1_ctrl_deint_menu[] = {
static const struct v4l2_ioctl_ops fdp1_ioctl_ops = {
.vidioc_querycap = fdp1_vidioc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = fdp1_enum_fmt_vid_cap,
- .vidioc_enum_fmt_vid_out_mplane = fdp1_enum_fmt_vid_out,
+ .vidioc_enum_fmt_vid_cap = fdp1_enum_fmt_vid_cap,
+ .vidioc_enum_fmt_vid_out = fdp1_enum_fmt_vid_out,
.vidioc_g_fmt_vid_cap_mplane = fdp1_g_fmt,
.vidioc_g_fmt_vid_out_mplane = fdp1_g_fmt,
.vidioc_try_fmt_vid_cap_mplane = fdp1_try_fmt,
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 1dfd2eb65920..a34f4e6b2f98 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -948,8 +948,8 @@ static int jpu_streamon(struct file *file, void *priv, enum v4l2_buf_type type)
static const struct v4l2_ioctl_ops jpu_ioctl_ops = {
.vidioc_querycap = jpu_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = jpu_enum_fmt_cap,
- .vidioc_enum_fmt_vid_out_mplane = jpu_enum_fmt_out,
+ .vidioc_enum_fmt_vid_cap = jpu_enum_fmt_cap,
+ .vidioc_enum_fmt_vid_out = jpu_enum_fmt_out,
.vidioc_g_fmt_vid_cap_mplane = jpu_g_fmt,
.vidioc_g_fmt_vid_out_mplane = jpu_g_fmt,
.vidioc_try_fmt_vid_cap_mplane = jpu_try_fmt,
diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
index 150196f7cf96..57d0c0f9fa4b 100644
--- a/drivers/media/platform/renesas-ceu.c
+++ b/drivers/media/platform/renesas-ceu.c
@@ -1339,7 +1339,7 @@ static int ceu_enum_frameintervals(struct file *file, void *fh,
static const struct v4l2_ioctl_ops ceu_ioctl_ops = {
.vidioc_querycap = ceu_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = ceu_enum_fmt_vid_cap,
+ .vidioc_enum_fmt_vid_cap = ceu_enum_fmt_vid_cap,
.vidioc_try_fmt_vid_cap_mplane = ceu_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap_mplane = ceu_s_fmt_vid_cap,
.vidioc_g_fmt_vid_cap_mplane = ceu_g_fmt_vid_cap,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index e111f9c47179..b270ff59c5e3 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -887,8 +887,8 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
/* v4l2_ioctl_ops */
static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
.vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt,
.vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt,
.vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 8fcf627dedfb..2fa16ee9c7b0 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -2343,8 +2343,8 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
static const struct v4l2_ioctl_ops s5p_mfc_enc_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
.vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt,
.vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt,
.vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt,
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index 207e7e76c048..ddfae9f4fbfa 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -1973,12 +1973,12 @@ static const struct v4l2_ctrl_ops vpe_ctrl_ops = {
static const struct v4l2_ioctl_ops vpe_ioctl_ops = {
.vidioc_querycap = vpe_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vpe_enum_fmt,
+ .vidioc_enum_fmt_vid_cap = vpe_enum_fmt,
.vidioc_g_fmt_vid_cap_mplane = vpe_g_fmt,
.vidioc_try_fmt_vid_cap_mplane = vpe_try_fmt,
.vidioc_s_fmt_vid_cap_mplane = vpe_s_fmt,
- .vidioc_enum_fmt_vid_out_mplane = vpe_enum_fmt,
+ .vidioc_enum_fmt_vid_out = vpe_enum_fmt,
.vidioc_g_fmt_vid_out_mplane = vpe_g_fmt,
.vidioc_try_fmt_vid_out_mplane = vpe_try_fmt,
.vidioc_s_fmt_vid_out_mplane = vpe_s_fmt,
diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index d7636fe9e174..fda726e43d60 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -1140,7 +1140,6 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = {
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_vid_cap,
@@ -1150,7 +1149,6 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = {
.vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
.vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out,
.vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_vid_out,
.vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_vid_out,
.vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_vid_out,
diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 342e0e6c103b..345adde47789 100644
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -500,20 +500,18 @@ static const struct v4l2_file_operations vivid_radio_fops = {
static const struct v4l2_ioctl_ops vivid_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,
- .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid,
+ .vidioc_enum_fmt_vid_cap = vivid_enum_fmt_vid,
.vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
.vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_mplane,
.vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_vid_cap_mplane,
.vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap_mplane,
.vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_vid_cap_mplane,
- .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid,
+ .vidioc_enum_fmt_vid_out = vivid_enum_fmt_vid,
.vidioc_g_fmt_vid_out = vidioc_g_fmt_vid_out,
.vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
.vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_mplane,
.vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_vid_out_mplane,
.vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_vid_out_mplane,
.vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_vid_out_mplane,
diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
index 74b83bcc6119..9307ce1cdd16 100644
--- a/drivers/media/platform/vivid/vivid-vid-common.c
+++ b/drivers/media/platform/vivid/vivid-vid-common.c
@@ -797,26 +797,6 @@ int vivid_enum_fmt_vid(struct file *file, void *priv,
return 0;
}
-int vidioc_enum_fmt_vid_mplane(struct file *file, void *priv,
- struct v4l2_fmtdesc *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_enum_fmt_vid(file, priv, f);
-}
-
-int vidioc_enum_fmt_vid(struct file *file, void *priv,
- struct v4l2_fmtdesc *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return vivid_enum_fmt_vid(file, priv, f);
-}
-
int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)
{
struct vivid_dev *dev = video_drvdata(file);
diff --git a/drivers/media/platform/vivid/vivid-vid-common.h b/drivers/media/platform/vivid/vivid-vid-common.h
index 29b6c0b40a1b..d908d9725283 100644
--- a/drivers/media/platform/vivid/vivid-vid-common.h
+++ b/drivers/media/platform/vivid/vivid-vid-common.h
@@ -28,8 +28,6 @@ void vivid_send_source_change(struct vivid_dev *dev, unsigned type);
int vivid_vid_adjust_sel(unsigned flags, struct v4l2_rect *r);
int vivid_enum_fmt_vid(struct file *file, void *priv, struct v4l2_fmtdesc *f);
-int vidioc_enum_fmt_vid_mplane(struct file *file, void *priv, struct v4l2_fmtdesc *f);
-int vidioc_enum_fmt_vid(struct file *file, void *priv, struct v4l2_fmtdesc *f);
int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id);
int vidioc_g_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
int vidioc_enum_dv_timings(struct file *file, void *_fh, struct v4l2_enum_dv_timings *timings);
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index d7528f82a66a..29946a2b2752 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -593,11 +593,9 @@ static void determine_valid_ioctls(struct video_device *vdev)
if (is_vid || is_tch) {
/* video and metadata specific ioctls */
if ((is_rx && (ops->vidioc_enum_fmt_vid_cap ||
- ops->vidioc_enum_fmt_vid_cap_mplane ||
ops->vidioc_enum_fmt_vid_overlay ||
ops->vidioc_enum_fmt_meta_cap)) ||
(is_tx && (ops->vidioc_enum_fmt_vid_out ||
- ops->vidioc_enum_fmt_vid_out_mplane ||
ops->vidioc_enum_fmt_meta_out)))
set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index f6d663934648..97ba365218fb 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
+ struct video_device *vdev = video_devdata(file);
struct v4l2_fmtdesc *p = arg;
int ret = check_fmt(file, p->type);
@@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
switch (p->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
+ (p->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))
+ break;
+
if (unlikely(!ops->vidioc_enum_fmt_vid_cap))
break;
ret = ops->vidioc_enum_fmt_vid_cap(file, fh, arg);
break;
- case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- if (unlikely(!ops->vidioc_enum_fmt_vid_cap_mplane))
- break;
- ret = ops->vidioc_enum_fmt_vid_cap_mplane(file, fh, arg);
- break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
if (unlikely(!ops->vidioc_enum_fmt_vid_overlay))
break;
ret = ops->vidioc_enum_fmt_vid_overlay(file, fh, arg);
break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ if (!!(vdev->device_caps & V4L2_CAP_VIDEO_OUTPUT_MPLANE) !=
+ (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE))
+ break;
+
if (unlikely(!ops->vidioc_enum_fmt_vid_out))
break;
ret = ops->vidioc_enum_fmt_vid_out(file, fh, arg);
break;
- case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- if (unlikely(!ops->vidioc_enum_fmt_vid_out_mplane))
- break;
- ret = ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg);
- break;
case V4L2_BUF_TYPE_SDR_CAPTURE:
if (unlikely(!ops->vidioc_enum_fmt_sdr_cap))
break;
diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index 9c0352b193a7..92240baddca4 100644
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -959,12 +959,12 @@ static const struct v4l2_file_operations imgu_v4l2_fops = {
static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = {
.vidioc_querycap = imgu_vidioc_querycap,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
.vidioc_g_fmt_vid_cap_mplane = imgu_vidioc_g_fmt,
.vidioc_s_fmt_vid_cap_mplane = imgu_vidioc_s_fmt,
.vidioc_try_fmt_vid_cap_mplane = imgu_vidioc_try_fmt,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out,
+ .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
.vidioc_g_fmt_vid_out_mplane = imgu_vidioc_g_fmt,
.vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt,
.vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt,
diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
index ab0fb2053620..f42d8325fd33 100644
--- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
+++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
@@ -493,8 +493,8 @@ const struct v4l2_ioctl_ops rockchip_vpu_enc_ioctl_ops = {
.vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_cap_mplane,
.vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_out_mplane,
.vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_cap_mplane,
- .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
- .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
+ .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
+ .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
.vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
.vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 8533ece5026e..400f2e46c108 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -26,19 +26,13 @@ struct v4l2_fh;
* :ref:`VIDIOC_QUERYCAP <vidioc_querycap>` ioctl
* @vidioc_enum_fmt_vid_cap: pointer to the function that implements
* :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
- * for video capture in single plane mode
+ * for video capture in single and multi plane mode
* @vidioc_enum_fmt_vid_overlay: pointer to the function that implements
* :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
* for video overlay
* @vidioc_enum_fmt_vid_out: pointer to the function that implements
* :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
- * for video output in single plane mode
- * @vidioc_enum_fmt_vid_cap_mplane: pointer to the function that implements
- * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
- * for video capture in multiplane mode
- * @vidioc_enum_fmt_vid_out_mplane: pointer to the function that implements
- * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
- * for video output in multiplane mode
+ * for video output in single and multi plane mode
* @vidioc_enum_fmt_sdr_cap: pointer to the function that implements
* :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
* for Software Defined Radio capture
@@ -313,10 +307,6 @@ struct v4l2_ioctl_ops {
struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_vid_out)(struct file *file, void *fh,
struct v4l2_fmtdesc *f);
- int (*vidioc_enum_fmt_vid_cap_mplane)(struct file *file, void *fh,
- struct v4l2_fmtdesc *f);
- int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
- struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_sdr_cap)(struct file *file, void *fh,
struct v4l2_fmtdesc *f);
int (*vidioc_enum_fmt_sdr_out)(struct file *file, void *fh,
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more)
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-11 8:24 ` Hans Verkuil
2019-04-04 8:16 ` [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations Boris Brezillon
` (5 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
This is part of the multiplanar and singleplanar unification process.
v4l2_ext_pix_format is supposed to work for both cases.
We also add the concept of modifiers already employed in DRM to expose
HW-specific formats (like tiled or compressed formats) and allow
exchanging this information with the DRM subsystem in a consistent way.
Note that V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY and
V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE types are no longer accepted
in v4l2_ext_format and will be rejected if you use the {G,S,TRY}EXT_FMT
ioctls. V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE is dropped as part
of the multiplanar/singleplanar unification.
V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY seems to be used mostly on old
drivers and supporting it would require some extra rework.
New hooks have been added to v4l2_ioctl_ops to support those new ioctls
in drivers, but, in the meantime, the core takes care of converting
{S,G,TRY}_EXT_FMT requests into {S,G,TRY}_FMT so that old drivers can
still work if the userspace app/lib uses the new ioctls.
The conversion is also done the other around to allow userspace
apps/libs using {S,G,TRY}_FMT to work with drivers implementing the
_ext_ hooks.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- Move the modifier in v4l2_ext_format (was formerly placed in
v4l2_ext_plane)
- Fix a few bugs in the converters and add a strict parameter to
allow conversion of uninitialized/mis-initialized objects
---
drivers/media/v4l2-core/v4l2-dev.c | 24 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 692 ++++++++++++++++++++++++---
include/media/v4l2-ioctl.h | 33 ++
include/uapi/linux/videodev2.h | 81 ++++
4 files changed, 749 insertions(+), 81 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 29946a2b2752..a233e0924ed3 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -599,32 +599,44 @@ static void determine_valid_ioctls(struct video_device *vdev)
ops->vidioc_enum_fmt_meta_out)))
set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
+ ops->vidioc_g_ext_fmt_vid_cap ||
ops->vidioc_g_fmt_vid_cap_mplane ||
ops->vidioc_g_fmt_vid_overlay ||
ops->vidioc_g_fmt_meta_cap)) ||
(is_tx && (ops->vidioc_g_fmt_vid_out ||
+ ops->vidioc_g_ext_fmt_vid_out ||
ops->vidioc_g_fmt_vid_out_mplane ||
ops->vidioc_g_fmt_vid_out_overlay ||
- ops->vidioc_g_fmt_meta_out)))
- set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
+ ops->vidioc_g_fmt_meta_out))) {
+ set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_G_EXT_FMT), valid_ioctls);
+ }
if ((is_rx && (ops->vidioc_s_fmt_vid_cap ||
+ ops->vidioc_s_ext_fmt_vid_cap ||
ops->vidioc_s_fmt_vid_cap_mplane ||
ops->vidioc_s_fmt_vid_overlay ||
ops->vidioc_s_fmt_meta_cap)) ||
(is_tx && (ops->vidioc_s_fmt_vid_out ||
+ ops->vidioc_s_ext_fmt_vid_out ||
ops->vidioc_s_fmt_vid_out_mplane ||
ops->vidioc_s_fmt_vid_out_overlay ||
- ops->vidioc_s_fmt_meta_out)))
- set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
+ ops->vidioc_s_fmt_meta_out))) {
+ set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_S_EXT_FMT), valid_ioctls);
+ }
if ((is_rx && (ops->vidioc_try_fmt_vid_cap ||
+ ops->vidioc_try_ext_fmt_vid_cap ||
ops->vidioc_try_fmt_vid_cap_mplane ||
ops->vidioc_try_fmt_vid_overlay ||
ops->vidioc_try_fmt_meta_cap)) ||
(is_tx && (ops->vidioc_try_fmt_vid_out ||
+ ops->vidioc_try_ext_fmt_vid_out ||
ops->vidioc_try_fmt_vid_out_mplane ||
ops->vidioc_try_fmt_vid_out_overlay ||
- ops->vidioc_try_fmt_meta_out)))
- set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
+ ops->vidioc_try_fmt_meta_out))) {
+ set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_TRY_EXT_FMT), valid_ioctls);
+ }
SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay);
SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf);
SET_VALID_IOCTL(ops, VIDIOC_S_FBUF, vidioc_s_fbuf);
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 97ba365218fb..f9001efa0aa5 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -381,6 +381,82 @@ static void v4l_print_format(const void *arg, bool write_only)
}
}
+static void v4l_print_ext_format(const void *arg, bool write_only)
+{
+ const struct v4l2_ext_format *p = arg;
+ const struct v4l2_ext_pix_format *pix;
+ const struct v4l2_vbi_format *vbi;
+ const struct v4l2_sliced_vbi_format *sliced;
+ const struct v4l2_sdr_format *sdr;
+ const struct v4l2_meta_format *meta;
+ unsigned int i;
+ u32 planes;
+
+ pr_cont("type=%s", prt_names(p->type, v4l2_type_names));
+ switch (p->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ pix = &p->fmt.pix;
+ pr_cont(", width=%u, height=%u, format=%c%c%c%c, modifier %llx, field=%s, colorspace=%d, num_planes=%u, flags=0x%x, ycbcr_enc=%u, quantization=%u, xfer_func=%u\n",
+ pix->width, pix->height,
+ (pix->pixelformat & 0xff),
+ (pix->pixelformat >> 8) & 0xff,
+ (pix->pixelformat >> 16) & 0xff,
+ (pix->pixelformat >> 24) & 0xff,
+ pix->modifier, prt_names(pix->field, v4l2_field_names),
+ pix->colorspace, pix->num_planes, pix->flags,
+ pix->ycbcr_enc, pix->quantization, pix->xfer_func);
+ planes = min_t(u32, pix->num_planes, VIDEO_MAX_PLANES);
+ for (i = 0; i < planes; i++)
+ pr_debug("plane %u: bytesperline=%u sizeimage=%u\n",
+ i, pix->plane_fmt[i].bytesperline,
+ pix->plane_fmt[i].sizeimage);
+ break;
+ case V4L2_BUF_TYPE_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_VBI_OUTPUT:
+ vbi = &p->fmt.vbi;
+ pr_cont(", sampling_rate=%u, offset=%u, samples_per_line=%u, sample_format=%c%c%c%c, start=%u,%u, count=%u,%u\n",
+ vbi->sampling_rate, vbi->offset,
+ vbi->samples_per_line,
+ (vbi->sample_format & 0xff),
+ (vbi->sample_format >> 8) & 0xff,
+ (vbi->sample_format >> 16) & 0xff,
+ (vbi->sample_format >> 24) & 0xff,
+ vbi->start[0], vbi->start[1],
+ vbi->count[0], vbi->count[1]);
+ break;
+ case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+ sliced = &p->fmt.sliced;
+ pr_cont(", service_set=0x%08x, io_size=%d\n",
+ sliced->service_set, sliced->io_size);
+ for (i = 0; i < 24; i++)
+ pr_debug("line[%02u]=0x%04x, 0x%04x\n", i,
+ sliced->service_lines[0][i],
+ sliced->service_lines[1][i]);
+ break;
+ case V4L2_BUF_TYPE_SDR_CAPTURE:
+ case V4L2_BUF_TYPE_SDR_OUTPUT:
+ sdr = &p->fmt.sdr;
+ pr_cont(", pixelformat=%c%c%c%c\n",
+ (sdr->pixelformat >> 0) & 0xff,
+ (sdr->pixelformat >> 8) & 0xff,
+ (sdr->pixelformat >> 16) & 0xff,
+ (sdr->pixelformat >> 24) & 0xff);
+ break;
+ case V4L2_BUF_TYPE_META_CAPTURE:
+ case V4L2_BUF_TYPE_META_OUTPUT:
+ meta = &p->fmt.meta;
+ pr_cont(", dataformat=%c%c%c%c, buffersize=%u\n",
+ (meta->dataformat >> 0) & 0xff,
+ (meta->dataformat >> 8) & 0xff,
+ (meta->dataformat >> 16) & 0xff,
+ (meta->dataformat >> 24) & 0xff,
+ meta->buffersize);
+ break;
+ }
+}
+
static void v4l_print_framebuffer(const void *arg, bool write_only)
{
const struct v4l2_framebuffer *p = arg;
@@ -951,11 +1027,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
switch (type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
if ((is_vid || is_tch) && is_rx &&
- (ops->vidioc_g_fmt_vid_cap || ops->vidioc_g_fmt_vid_cap_mplane))
+ (ops->vidioc_g_fmt_vid_cap ||
+ ops->vidioc_g_ext_fmt_vid_cap ||
+ ops->vidioc_g_fmt_vid_cap_mplane))
return 0;
break;
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- if (is_vid && is_rx && ops->vidioc_g_fmt_vid_cap_mplane)
+ if (is_vid && is_rx &&
+ (ops->vidioc_g_fmt_vid_cap_mplane ||
+ ops->vidioc_g_ext_fmt_vid_cap))
return 0;
break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
@@ -964,11 +1044,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
if (is_vid && is_tx &&
- (ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out_mplane))
+ (ops->vidioc_g_fmt_vid_out ||
+ ops->vidioc_g_ext_fmt_vid_out ||
+ ops->vidioc_g_fmt_vid_out_mplane))
return 0;
break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- if (is_vid && is_tx && ops->vidioc_g_fmt_vid_out_mplane)
+ if (is_vid && is_tx &&
+ (ops->vidioc_g_ext_fmt_vid_out ||
+ ops->vidioc_g_fmt_vid_out_mplane))
return 0;
break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
@@ -1048,6 +1132,197 @@ static void v4l_sanitize_format(struct v4l2_format *fmt)
sizeof(fmt->fmt.pix) - offset);
}
+int v4l2_ext_format_to_format(const struct v4l2_ext_format *e,
+ struct v4l2_format *f, bool mplane_cap,
+ bool strict)
+{
+ const struct v4l2_plane_ext_pix_format *pe;
+ struct v4l2_plane_pix_format *p;
+ unsigned int i;
+
+ memset(f, 0, sizeof(*f));
+
+ switch (e->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ /*
+ * Make sure no modifier is required before doing the
+ * conversion.
+ */
+ if (e->fmt.pix.modifier && strict)
+ return -EINVAL;
+
+ if ((e->fmt.pix.num_planes > VIDEO_MAX_PLANES ||
+ !e->fmt.pix.num_planes) && strict)
+ return -EINVAL;
+
+ if (e->fmt.pix.num_planes > 1 && !mplane_cap && strict)
+ return -EINVAL;
+
+ if (!mplane_cap) {
+ f->fmt.pix.width = e->fmt.pix.width;
+ f->fmt.pix.height = e->fmt.pix.height;
+ f->fmt.pix.pixelformat = e->fmt.pix.pixelformat;
+ f->fmt.pix.field = e->fmt.pix.field;
+ f->fmt.pix.colorspace = e->fmt.pix.colorspace;
+ f->fmt.pix.flags = e->fmt.pix.flags;
+ f->fmt.pix.ycbcr_enc = e->fmt.pix.ycbcr_enc;
+ f->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ f->fmt.pix.quantization = e->fmt.pix.quantization;
+ pe = &e->fmt.pix.plane_fmt[0];
+ f->fmt.pix.bytesperline = pe->bytesperline;
+ f->fmt.pix.sizeimage = pe->sizeimage;
+ f->type = e->type;
+ break;
+ }
+
+ f->fmt.pix_mp.width = e->fmt.pix.width;
+ f->fmt.pix_mp.height = e->fmt.pix.height;
+ f->fmt.pix_mp.pixelformat = e->fmt.pix.pixelformat;
+ f->fmt.pix_mp.field = e->fmt.pix.field;
+ f->fmt.pix_mp.colorspace = e->fmt.pix.colorspace;
+ f->fmt.pix_mp.flags = e->fmt.pix.flags;
+ f->fmt.pix_mp.ycbcr_enc = e->fmt.pix.ycbcr_enc;
+ f->fmt.pix_mp.quantization = e->fmt.pix.quantization;
+ if (e->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+ else
+ f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+
+ for (i = 0; i < VIDEO_MAX_PLANES; i++) {
+ pe = &e->fmt.pix.plane_fmt[i];
+ p = &f->fmt.pix_mp.plane_fmt[i];
+ p->bytesperline = pe->bytesperline;
+ p->sizeimage = pe->sizeimage;
+ }
+ break;
+
+ case V4L2_BUF_TYPE_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_VBI_OUTPUT:
+ f->type = e->type;
+ f->fmt.vbi = e->fmt.vbi;
+ break;
+
+ case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+ f->type = e->type;
+ f->fmt.sliced = e->fmt.sliced;
+ break;
+
+ case V4L2_BUF_TYPE_SDR_CAPTURE:
+ case V4L2_BUF_TYPE_SDR_OUTPUT:
+ f->type = e->type;
+ f->fmt.sdr = e->fmt.sdr;
+ break;
+
+ case V4L2_BUF_TYPE_META_CAPTURE:
+ case V4L2_BUF_TYPE_META_OUTPUT:
+ f->type = e->type;
+ f->fmt.meta = e->fmt.meta;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_ext_format_to_format);
+
+int v4l2_format_to_ext_format(const struct v4l2_format *f,
+ struct v4l2_ext_format *e, bool strict)
+{
+ const struct v4l2_plane_pix_format *p;
+ struct v4l2_plane_ext_pix_format *pe;
+ unsigned int i;
+
+ memset(e, 0, sizeof(*e));
+
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ e->fmt.pix.width = f->fmt.pix.width;
+ e->fmt.pix.height = f->fmt.pix.height;
+ e->fmt.pix.pixelformat = f->fmt.pix.pixelformat;
+ e->fmt.pix.field = f->fmt.pix.field;
+ e->fmt.pix.colorspace = f->fmt.pix.colorspace;
+ e->fmt.pix.flags = f->fmt.pix.flags;
+ e->fmt.pix.ycbcr_enc = f->fmt.pix.ycbcr_enc;
+ e->fmt.pix.quantization = f->fmt.pix.quantization;
+ e->fmt.pix.num_planes = 1;
+ e->fmt.pix.plane_fmt[0].bytesperline = f->fmt.pix.bytesperline;
+ e->fmt.pix.plane_fmt[0].sizeimage = f->fmt.pix.sizeimage;
+ e->type = f->type;
+ break;
+
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ if ((f->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES ||
+ !f->fmt.pix_mp.num_planes) && strict)
+ return -EINVAL;
+
+ e->fmt.pix.width = f->fmt.pix_mp.width;
+ e->fmt.pix.height = f->fmt.pix_mp.height;
+ e->fmt.pix.pixelformat = f->fmt.pix_mp.pixelformat;
+ e->fmt.pix.field = f->fmt.pix_mp.field;
+ e->fmt.pix.colorspace = f->fmt.pix_mp.colorspace;
+ e->fmt.pix.flags = f->fmt.pix_mp.flags;
+ e->fmt.pix.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
+ e->fmt.pix.quantization = f->fmt.pix_mp.quantization;
+ e->fmt.pix.num_planes = f->fmt.pix_mp.num_planes;
+ if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+ e->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ else
+ e->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+ for (i = 0; i < VIDEO_MAX_PLANES; i++) {
+ pe = &e->fmt.pix.plane_fmt[i];
+ p = &f->fmt.pix_mp.plane_fmt[i];
+ pe->bytesperline = p->bytesperline;
+ pe->sizeimage = p->sizeimage;
+ }
+ break;
+
+ case V4L2_BUF_TYPE_VIDEO_OVERLAY:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
+ /*
+ * OVERLAY formats are not supported by the _EXT_FMT
+ * ioctl()s.
+ */
+ return -EINVAL;
+
+ case V4L2_BUF_TYPE_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_VBI_OUTPUT:
+ e->type = f->type;
+ e->fmt.vbi = f->fmt.vbi;
+ break;
+
+ case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
+ case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
+ e->type = f->type;
+ e->fmt.sliced = f->fmt.sliced;
+ break;
+
+ case V4L2_BUF_TYPE_SDR_CAPTURE:
+ case V4L2_BUF_TYPE_SDR_OUTPUT:
+ e->type = f->type;
+ e->fmt.sdr = f->fmt.sdr;
+ break;
+
+ case V4L2_BUF_TYPE_META_CAPTURE:
+ case V4L2_BUF_TYPE_META_OUTPUT:
+ e->type = f->type;
+ e->fmt.meta = f->fmt.meta;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_format_to_ext_format);
+
static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -1440,6 +1715,38 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
return ret;
}
+static int v4l_g_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh,
+ struct v4l2_format *f)
+{
+ struct v4l2_ext_format ef = {
+ .type = f->type,
+ };
+ int ret;
+
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ ret = ops->vidioc_g_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
+ break;
+
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ ret = ops->vidioc_g_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ if (ret)
+ return ret;
+
+ return v4l2_ext_format_to_format(&ef, f,
+ V4L2_TYPE_IS_MULTIPLANAR(f->type),
+ true);
+}
+
static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -1475,15 +1782,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
switch (p->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
- if (unlikely(!ops->vidioc_g_fmt_vid_cap))
- break;
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- return ret;
+ if (ops->vidioc_g_fmt_vid_cap) {
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ return ret;
+ } else if (ops->vidioc_g_ext_fmt_vid_cap) {
+ return v4l_g_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
+ if (ops->vidioc_g_fmt_vid_cap_mplane)
+ return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
+ else if (ops->vidioc_g_ext_fmt_vid_cap)
+ return v4l_g_fmt_ext_pix(ops, file, fh, p);
+ break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
return ops->vidioc_g_fmt_vid_overlay(file, fh, arg);
case V4L2_BUF_TYPE_VBI_CAPTURE:
@@ -1491,15 +1805,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
return ops->vidioc_g_fmt_sliced_vbi_cap(file, fh, arg);
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
- if (unlikely(!ops->vidioc_g_fmt_vid_out))
- break;
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- return ret;
+ if (ops->vidioc_g_fmt_vid_out) {
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ return ret;
+ } else if (ops->vidioc_g_ext_fmt_vid_out) {
+ return v4l_g_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
+ if (ops->vidioc_g_fmt_vid_out_mplane)
+ return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
+ else if (ops->vidioc_g_ext_fmt_vid_out)
+ return v4l_g_fmt_ext_pix(ops, file, fh, p);
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
return ops->vidioc_g_fmt_vid_out_overlay(file, fh, arg);
case V4L2_BUF_TYPE_VBI_OUTPUT:
@@ -1518,6 +1839,43 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
return -EINVAL;
}
+static int v4l_g_ext_fmt(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ struct v4l2_ext_format *ef = arg;
+ struct v4l2_format f = {
+ .type = ef->type,
+ };
+ int ret;
+
+ ret = check_fmt(file, ef->type);
+ if (ret)
+ return ret;
+
+ memset(&ef->fmt, 0, sizeof(ef->fmt));
+
+ switch (ef->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ if (ops->vidioc_g_ext_fmt_vid_cap)
+ return ops->vidioc_g_ext_fmt_vid_cap(file, fh,
+ &ef->fmt.pix);
+ break;
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ if (ops->vidioc_g_ext_fmt_vid_out)
+ return ops->vidioc_g_ext_fmt_vid_out(file, fh,
+ &ef->fmt.pix);
+ break;
+ default:
+ break;
+ }
+
+ ret = v4l_g_fmt(ops, file, fh, &f);
+ if (ret)
+ return ret;
+
+ return v4l2_format_to_ext_format(&f, ef, true);
+}
+
static void v4l_pix_format_touch(struct v4l2_pix_format *p)
{
/*
@@ -1533,6 +1891,40 @@ static void v4l_pix_format_touch(struct v4l2_pix_format *p)
p->xfer_func = 0;
}
+static int v4l_s_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh,
+ struct v4l2_format *f)
+{
+ struct v4l2_ext_format ef;
+ int ret;
+
+ ret = v4l2_format_to_ext_format(f, &ef, false);
+ if (ret)
+ return ret;
+
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ ret = ops->vidioc_s_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
+ break;
+
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ ret = ops->vidioc_s_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ if (ret)
+ return ret;
+
+ return v4l2_ext_format_to_format(&ef, f,
+ V4L2_TYPE_IS_MULTIPLANAR(f->type),
+ true);
+}
+
static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -1551,23 +1943,31 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
switch (p->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
- if (unlikely(!ops->vidioc_s_fmt_vid_cap))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix);
- ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ if (ops->vidioc_s_fmt_vid_cap) {
+ CLEAR_AFTER_FIELD(p, fmt.pix);
+ ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ } else if (ops->vidioc_s_ext_fmt_vid_cap) {
+ ret = v4l_s_fmt_ext_pix(ops, file, fh, arg);
+ } else {
+ ret = -EINVAL;
+ }
+
if (vfd->vfl_type == VFL_TYPE_TOUCH)
v4l_pix_format_touch(&p->fmt.pix);
return ret;
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
- for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
- CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
- bytesperline);
- return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
+ if (ops->vidioc_s_fmt_vid_cap_mplane) {
+ CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
+ for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
+ CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
+ bytesperline);
+ return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
+ } else if (ops->vidioc_s_ext_fmt_vid_cap) {
+ return v4l_s_fmt_ext_pix(ops, file, fh, arg);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
if (unlikely(!ops->vidioc_s_fmt_vid_overlay))
break;
@@ -1584,21 +1984,27 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
CLEAR_AFTER_FIELD(p, fmt.sliced);
return ops->vidioc_s_fmt_sliced_vbi_cap(file, fh, arg);
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
- if (unlikely(!ops->vidioc_s_fmt_vid_out))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix);
- ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- return ret;
+ if (ops->vidioc_s_fmt_vid_out) {
+ CLEAR_AFTER_FIELD(p, fmt.pix);
+ ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ return ret;
+ } else if (ops->vidioc_s_ext_fmt_vid_out) {
+ return v4l_s_fmt_ext_pix(ops, file, fh, arg);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
- for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
- CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
- bytesperline);
- return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
+ if (ops->vidioc_s_fmt_vid_out_mplane) {
+ CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
+ for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
+ CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
+ bytesperline);
+ return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
+ } else if (ops->vidioc_s_ext_fmt_vid_out) {
+ return v4l_s_fmt_ext_pix(ops, file, fh, arg);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay))
break;
@@ -1638,6 +2044,84 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
return -EINVAL;
}
+static int v4l_s_ext_fmt(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ struct video_device *vfd = video_devdata(file);
+ struct v4l2_ext_format *ef = arg;
+ struct v4l2_format f;
+ int ret;
+
+ ret = check_fmt(file, ef->type);
+ if (ret)
+ return ret;
+
+ switch (ef->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ if (ops->vidioc_s_ext_fmt_vid_cap)
+ return ops->vidioc_s_ext_fmt_vid_cap(file, fh,
+ &ef->fmt.pix);
+ break;
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ if (ops->vidioc_s_ext_fmt_vid_out)
+ return ops->vidioc_s_ext_fmt_vid_out(file, fh,
+ &ef->fmt.pix);
+ break;
+ default:
+ break;
+ }
+
+ ret = v4l2_ext_format_to_format(ef, &f,
+ vfd->device_caps &
+ (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+ V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+ V4L2_CAP_VIDEO_M2M_MPLANE),
+ false);
+ if (ret)
+ return ret;
+
+ ret = v4l_s_fmt(ops, file, fh, &f);
+ if (ret)
+ return ret;
+
+ return v4l2_format_to_ext_format(&f, ef, true);
+}
+
+static int v4l_try_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh,
+ struct v4l2_format *f)
+{
+ struct v4l2_ext_format ef;
+ int ret;
+
+ ret = v4l2_format_to_ext_format(f, &ef, false);
+ if (ret)
+ return ret;
+
+ switch (f->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+ ret = ops->vidioc_try_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
+ break;
+
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+ ret = ops->vidioc_try_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ if (ret)
+ return ret;
+
+ return v4l2_ext_format_to_format(&ef, f,
+ V4L2_TYPE_IS_MULTIPLANAR(f->type),
+ true);
+
+}
+
static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -1652,21 +2136,27 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
switch (p->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
- if (unlikely(!ops->vidioc_try_fmt_vid_cap))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix);
- ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- return ret;
+ if (ops->vidioc_try_fmt_vid_cap) {
+ CLEAR_AFTER_FIELD(p, fmt.pix);
+ ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ return ret;
+ } else if (ops->vidioc_try_ext_fmt_vid_cap) {
+ return v4l_try_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
- for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
- CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
- bytesperline);
- return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
+ if (ops->vidioc_try_fmt_vid_cap_mplane) {
+ CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
+ for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
+ CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
+ bytesperline);
+ return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
+ } else if (ops->vidioc_try_ext_fmt_vid_cap) {
+ return v4l_try_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
if (unlikely(!ops->vidioc_try_fmt_vid_overlay))
break;
@@ -1683,21 +2173,27 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
CLEAR_AFTER_FIELD(p, fmt.sliced);
return ops->vidioc_try_fmt_sliced_vbi_cap(file, fh, arg);
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
- if (unlikely(!ops->vidioc_try_fmt_vid_out))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix);
- ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
- /* just in case the driver zeroed it again */
- p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
- return ret;
+ if (ops->vidioc_try_fmt_vid_out) {
+ CLEAR_AFTER_FIELD(p, fmt.pix);
+ ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
+ /* just in case the driver zeroed it again */
+ p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
+ return ret;
+ } else if (ops->vidioc_try_ext_fmt_vid_cap) {
+ return v4l_try_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))
- break;
- CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
- for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
- CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
- bytesperline);
- return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
+ if (ops->vidioc_try_fmt_vid_out_mplane) {
+ CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
+ for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
+ CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
+ bytesperline);
+ return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
+ } else if (ops->vidioc_try_ext_fmt_vid_cap) {
+ return v4l_try_fmt_ext_pix(ops, file, fh, p);
+ }
+ break;
case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay))
break;
@@ -1737,6 +2233,49 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
return -EINVAL;
}
+static int v4l_try_ext_fmt(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ struct video_device *vfd = video_devdata(file);
+ struct v4l2_ext_format *ef = arg;
+ struct v4l2_format f;
+ int ret;
+
+ ret = check_fmt(file, ef->type);
+ if (ret)
+ return ret;
+
+ switch (ef->type) {
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ if (ops->vidioc_try_ext_fmt_vid_cap)
+ return ops->vidioc_try_ext_fmt_vid_cap(file, fh,
+ &ef->fmt.pix);
+ break;
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ if (ops->vidioc_try_ext_fmt_vid_out)
+ return ops->vidioc_try_ext_fmt_vid_out(file, fh,
+ &ef->fmt.pix);
+ break;
+ default:
+ break;
+ }
+
+ ret = v4l2_ext_format_to_format(ef, &f,
+ vfd->device_caps &
+ (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+ V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+ V4L2_CAP_VIDEO_M2M_MPLANE),
+ false);
+ if (ret)
+ return ret;
+
+ ret = v4l_try_fmt(ops, file, fh, &f);
+ if (ret)
+ return ret;
+
+ return v4l2_format_to_ext_format(&f, ef, true);
+}
+
static int v4l_streamon(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -2655,7 +3194,9 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
IOCTL_INFO(VIDIOC_QUERYCAP, v4l_querycap, v4l_print_querycap, 0),
IOCTL_INFO(VIDIOC_ENUM_FMT, v4l_enum_fmt, v4l_print_fmtdesc, INFO_FL_CLEAR(v4l2_fmtdesc, type)),
IOCTL_INFO(VIDIOC_G_FMT, v4l_g_fmt, v4l_print_format, 0),
+ IOCTL_INFO(VIDIOC_G_EXT_FMT, v4l_g_ext_fmt, v4l_print_ext_format, 0),
IOCTL_INFO(VIDIOC_S_FMT, v4l_s_fmt, v4l_print_format, INFO_FL_PRIO),
+ IOCTL_INFO(VIDIOC_S_EXT_FMT, v4l_s_ext_fmt, v4l_print_ext_format, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_REQBUFS, v4l_reqbufs, v4l_print_requestbuffers, INFO_FL_PRIO | INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_QUERYBUF, v4l_querybuf, v4l_print_buffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_buffer, length)),
IOCTL_INFO(VIDIOC_G_FBUF, v4l_stub_g_fbuf, v4l_print_framebuffer, 0),
@@ -2702,6 +3243,7 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
IOCTL_INFO(VIDIOC_S_JPEGCOMP, v4l_stub_s_jpegcomp, v4l_print_jpegcompression, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_QUERYSTD, v4l_querystd, v4l_print_std, 0),
IOCTL_INFO(VIDIOC_TRY_FMT, v4l_try_fmt, v4l_print_format, 0),
+ IOCTL_INFO(VIDIOC_TRY_EXT_FMT, v4l_try_ext_fmt, v4l_print_ext_format, 0),
IOCTL_INFO(VIDIOC_ENUMAUDIO, v4l_stub_enumaudio, v4l_print_audio, INFO_FL_CLEAR(v4l2_audio, index)),
IOCTL_INFO(VIDIOC_ENUMAUDOUT, v4l_stub_enumaudout, v4l_print_audioout, INFO_FL_CLEAR(v4l2_audioout, index)),
IOCTL_INFO(VIDIOC_G_PRIORITY, v4l_g_priority, v4l_print_u32, 0),
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 400f2e46c108..a1fb5eac144b 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -48,11 +48,16 @@ struct v4l2_fh;
* @vidioc_g_fmt_vid_cap: pointer to the function that implements
* :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video capture
* in single plane mode
+ * @vidioc_g_ext_fmt_vid_cap: pointer to the function that implements
+ * :ref:`VIDIOC_G_EXT_FMT <vidioc_g_ext_fmt>` ioctl logic for video
+ * capture
* @vidioc_g_fmt_vid_overlay: pointer to the function that implements
* :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay
* @vidioc_g_fmt_vid_out: pointer to the function that implements
* :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video out
* in single plane mode
+ * @vidioc_g_ext_fmt_vid_out: pointer to the function that implements
+ * :ref:`VIDIOC_G_EXT_FMT <vidioc_g_ext_fmt>` ioctl logic for video out
* @vidioc_g_fmt_vid_out_overlay: pointer to the function that implements
* :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
* @vidioc_g_fmt_vbi_cap: pointer to the function that implements
@@ -82,11 +87,16 @@ struct v4l2_fh;
* @vidioc_s_fmt_vid_cap: pointer to the function that implements
* :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video capture
* in single plane mode
+ * @vidioc_s_ext_fmt_vid_cap: pointer to the function that implements
+ * :ref:`VIDIOC_S_EXT_FMT <vidioc_s_ext_fmt>` ioctl logic for video
+ * capture
* @vidioc_s_fmt_vid_overlay: pointer to the function that implements
* :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay
* @vidioc_s_fmt_vid_out: pointer to the function that implements
* :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video out
* in single plane mode
+ * @vidioc_s_ext_fmt_vid_out: pointer to the function that implements
+ * :ref:`VIDIOC_S_EXT_FMT <vidioc_g_fmt>` ioctl logic for video out
* @vidioc_s_fmt_vid_out_overlay: pointer to the function that implements
* :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
* @vidioc_s_fmt_vbi_cap: pointer to the function that implements
@@ -116,11 +126,16 @@ struct v4l2_fh;
* @vidioc_try_fmt_vid_cap: pointer to the function that implements
* :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video capture
* in single plane mode
+ * @vidioc_try_ext_fmt_vid_cap: pointer to the function that implements
+ * :ref:`VIDIOC_TRY_EXT_FMT <vidioc_try_ext_fmt>` ioctl logic for video
+ capture
* @vidioc_try_fmt_vid_overlay: pointer to the function that implements
* :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
* @vidioc_try_fmt_vid_out: pointer to the function that implements
* :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video out
* in single plane mode
+ * @vidioc_try_ext_fmt_vid_out: pointer to the function that implements
+ * :ref:`VIDIOC_TRY_EXT_FMT <vidioc_g_fmt>` ioctl logic for video out
* @vidioc_try_fmt_vid_out_overlay: pointer to the function that implements
* :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
* output
@@ -319,10 +334,14 @@ struct v4l2_ioctl_ops {
/* VIDIOC_G_FMT handlers */
int (*vidioc_g_fmt_vid_cap)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_g_ext_fmt_vid_cap)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_g_fmt_vid_out)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_g_ext_fmt_vid_out)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_g_fmt_vbi_cap)(struct file *file, void *fh,
@@ -349,10 +368,14 @@ struct v4l2_ioctl_ops {
/* VIDIOC_S_FMT handlers */
int (*vidioc_s_fmt_vid_cap)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_s_ext_fmt_vid_cap)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_s_fmt_vid_out)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_s_ext_fmt_vid_out)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_s_fmt_vbi_cap)(struct file *file, void *fh,
@@ -379,10 +402,14 @@ struct v4l2_ioctl_ops {
/* VIDIOC_TRY_FMT handlers */
int (*vidioc_try_fmt_vid_cap)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_try_ext_fmt_vid_cap)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_try_fmt_vid_out)(struct file *file, void *fh,
struct v4l2_format *f);
+ int (*vidioc_try_ext_fmt_vid_out)(struct file *file, void *fh,
+ struct v4l2_ext_pix_format *f);
int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
struct v4l2_format *f);
int (*vidioc_try_fmt_vbi_cap)(struct file *file, void *fh,
@@ -722,4 +749,10 @@ long int video_usercopy(struct file *file, unsigned int cmd,
long int video_ioctl2(struct file *file,
unsigned int cmd, unsigned long int arg);
+int v4l2_format_to_ext_format(const struct v4l2_format *f,
+ struct v4l2_ext_format *e, bool strict);
+int v4l2_ext_format_to_format(const struct v4l2_ext_format *e,
+ struct v4l2_format *f,
+ bool mplane_cap, bool strict);
+
#endif /* _V4L2_IOCTL_H */
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 1db220da3bcc..b32c4a10c46f 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -2171,6 +2171,55 @@ struct v4l2_pix_format_mplane {
__u8 reserved[7];
} __attribute__ ((packed));
+/**
+ * struct v4l2_plane_ext_pix_format - additional, per-plane format definition
+ * @sizeimage: maximum size in bytes required for data, for which
+ * this plane will be used
+ * @bytesperline: distance in bytes between the leftmost pixels in two
+ * adjacent lines
+ */
+struct v4l2_plane_ext_pix_format {
+ __u32 sizeimage;
+ __u32 bytesperline;
+};
+
+/**
+ * struct v4l2_ext_pix_format - extended single/multiplanar format definition
+ * @width: image width in pixels
+ * @height: image height in pixels
+ * @field: enum v4l2_field; field order (for interlaced video)
+ * @pixelformat: little endian four character code (fourcc)
+ * @modifier: modifier applied to the format (used for tiled formats and other
+ * kind of HW-specific formats, like compressed formats)
+ * @colorspace: enum v4l2_colorspace; supplemental to pixelformat
+ * @num_planes: number of planes for this format. Should be equal to 1
+ * for single-planar formats and greater than 1 for
+ * multiplanar ones
+ * @plane_fmt: per-plane information
+ * @flags: format flags (V4L2_PIX_FMT_FLAG_*)
+ * @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding
+ * @hsv_enc: enum v4l2_hsv_encoding, HSV encoding
+ * @quantization: enum v4l2_quantization, colorspace quantization
+ * @xfer_func: enum v4l2_xfer_func, colorspace transfer function
+ */
+struct v4l2_ext_pix_format {
+ __u32 width;
+ __u32 height;
+ __u32 field;
+ __u32 pixelformat;
+ __u64 modifier;
+ __u32 colorspace;
+ __u32 num_planes;
+ struct v4l2_plane_ext_pix_format plane_fmt[VIDEO_MAX_PLANES];
+ __u8 flags;
+ union {
+ __u8 ycbcr_enc;
+ __u8 hsv_enc;
+ };
+ __u8 quantization;
+ __u8 xfer_func;
+};
+
/**
* struct v4l2_sdr_format - SDR format definition
* @pixelformat: little endian four character code (fourcc)
@@ -2216,6 +2265,35 @@ struct v4l2_format {
} fmt;
};
+/**
+ * struct v4l2_ext_format - extended stream data format
+ * @type: enum v4l2_buf_type; type of the data stream.
+ * V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY and
+ * V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE are not supported
+ * @pix: definition of an image format. Used for
+ * V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT} types
+ * @vbi: raw VBI capture or output parameters. Used for
+ * V4L2_BUF_TYPE_VBI_{CAPTURE,OUTPUT} types
+ * @sliced: sliced VBI capture or output parameters. Used for
+ * V4L2_BUF_TYPE_SLICED_VBI_{CAPTURE,OUTPUT} types.
+ * @sdr: SDR capture or output parameters. Used for
+ * V4L2_BUF_TYPE_SDR_{CAPTURE,OUTPUT} types
+ * @meta: meta capture or output parameters. Used for
+ * V4L2_BUF_TYPE_META_{CAPTURE,OUTPUT} types
+ * @raw_data: placeholder for future extensions and custom formats
+ */
+struct v4l2_ext_format {
+ __u32 type;
+ union {
+ struct v4l2_ext_pix_format pix;
+ struct v4l2_vbi_format vbi;
+ struct v4l2_sliced_vbi_format sliced;
+ struct v4l2_sdr_format sdr;
+ struct v4l2_meta_format meta;
+ __u8 raw_data[200];
+ } fmt;
+};
+
/* Stream type-dependent parameters
*/
struct v4l2_streamparm {
@@ -2480,6 +2558,9 @@ struct v4l2_create_buffers {
#define VIDIOC_QUERY_EXT_CTRL _IOWR('V', 103, struct v4l2_query_ext_ctrl)
+#define VIDIOC_G_EXT_FMT _IOWR('V', 104, struct v4l2_ext_format)
+#define VIDIOC_S_EXT_FMT _IOWR('V', 105, struct v4l2_ext_format)
+#define VIDIOC_TRY_EXT_FMT _IOWR('V', 106, struct v4l2_ext_format)
/* Reminder: when adding new ioctls please add support for them to
drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more) Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-12 8:57 ` Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 4/7] media: videobuf2: Expose helpers to implement the _ext_fmt and _ext_buf hooks Boris Brezillon
` (4 subsequent siblings)
7 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
From: Hans Verkuil <hans.verkuil@cisco.com>
Those extended buffer ops have several purpose:
1/ Fix y2038 issues by converting the timestamp into an u64 counting
the number of ns elapsed since 1970
2/ Unify single/multiplanar handling
3/ Add a new start offset field to each v4l2 plane buffer info struct
to support the case where a single buffer object is storing all
planes data, each one being placed at a different offset
New hooks are created in v4l2_ioctl_ops so that drivers can start using
these new objects.
The core takes care of converting new ioctls requests to old ones
if the driver does not support the new hooks, and vice versa.
Note that the timecode field is gone, since there doesn't seem to be
in-kernel users, but can be added back in the reserved area if needed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- Add reserved space to v4l2_ext_buffer so that new fields can be added
later on
Hans,
I kept initial autorship as this patch is heavily based on your
initial proposal [1]. Please let me know if you want me to change
it.
Regards,
Boris
[1]https://git.linuxtv.org/hverkuil/media_tree.git/commit/?h=v4l2-buffer&id=a95549df06d9900f3559afdbb9da06bd4b22d1f3
---
drivers/media/v4l2-core/v4l2-dev.c | 30 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 428 +++++++++++++++++++++++++--
include/media/v4l2-ioctl.h | 30 ++
include/uapi/linux/videodev2.h | 130 ++++++++
4 files changed, 591 insertions(+), 27 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index a233e0924ed3..0675df7f264b 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -700,12 +700,30 @@ static void determine_valid_ioctls(struct video_device *vdev)
if (is_vid || is_vbi || is_sdr || is_tch) {
/* ioctls valid for video, metadata, vbi or sdr */
SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
- SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);
- SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf);
- SET_VALID_IOCTL(ops, VIDIOC_EXPBUF, vidioc_expbuf);
- SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);
- SET_VALID_IOCTL(ops, VIDIOC_CREATE_BUFS, vidioc_create_bufs);
- SET_VALID_IOCTL(ops, VIDIOC_PREPARE_BUF, vidioc_prepare_buf);
+ if (ops->vidioc_querybuf || ops->vidioc_ext_querybuf) {
+ set_bit(_IOC_NR(VIDIOC_QUERYBUF), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_QUERYBUF), valid_ioctls);
+ }
+ if (ops->vidioc_qbuf || ops->vidioc_ext_qbuf) {
+ set_bit(_IOC_NR(VIDIOC_QBUF), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_QBUF), valid_ioctls);
+ }
+ if (ops->vidioc_expbuf || ops->vidioc_ext_expbuf) {
+ set_bit(_IOC_NR(VIDIOC_EXPBUF), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_EXPBUF), valid_ioctls);
+ }
+ if (ops->vidioc_dqbuf || ops->vidioc_ext_dqbuf) {
+ set_bit(_IOC_NR(VIDIOC_DQBUF), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_DQBUF), valid_ioctls);
+ }
+ if (ops->vidioc_create_bufs || ops->vidioc_ext_create_bufs) {
+ set_bit(_IOC_NR(VIDIOC_CREATE_BUFS), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_CREATE_BUFS), valid_ioctls);
+ }
+ if (ops->vidioc_prepare_buf || ops->vidioc_ext_prepare_buf) {
+ set_bit(_IOC_NR(VIDIOC_PREPARE_BUF), valid_ioctls);
+ set_bit(_IOC_NR(VIDIOC_EXT_PREPARE_BUF), valid_ioctls);
+ }
SET_VALID_IOCTL(ops, VIDIOC_STREAMON, vidioc_streamon);
SET_VALID_IOCTL(ops, VIDIOC_STREAMOFF, vidioc_streamoff);
}
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index f9001efa0aa5..ce24c53be939 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -583,6 +583,25 @@ static void v4l_print_buffer(const void *arg, bool write_only)
tc->type, tc->flags, tc->frames, *(__u32 *)tc->userbits);
}
+static void v4l_print_ext_buffer(const void *arg, bool write_only)
+{
+ const struct v4l2_ext_buffer *p = arg;
+ const struct v4l2_ext_plane *plane;
+ int i;
+
+ pr_cont("%lld index=%d, type=%s, flags=0x%08x, field=%s, sequence=%d, memory=%s\n",
+ p->timestamp, p->index, prt_names(p->type, v4l2_type_names),
+ p->flags, prt_names(p->field, v4l2_field_names),
+ p->sequence, prt_names(p->memory, v4l2_memory_names));
+
+ for (i = 0; i < p->num_planes; ++i) {
+ plane = &p->planes[i];
+ pr_debug("plane %d: bytesused=%d, data_offset=0x%08x, offset/userptr=0x%llx, length=%d\n",
+ i, plane->bytesused, plane->data_offset,
+ plane->m.userptr, plane->length);
+ }
+}
+
static void v4l_print_exportbuffer(const void *arg, bool write_only)
{
const struct v4l2_exportbuffer *p = arg;
@@ -592,6 +611,18 @@ static void v4l_print_exportbuffer(const void *arg, bool write_only)
p->index, p->plane, p->flags);
}
+static void v4l_print_ext_exportbuffer(const void *arg, bool write_only)
+{
+ const struct v4l2_ext_exportbuffer *p = arg;
+ unsigned int i;
+
+ pr_cont("type=%s, index=%u, first_plane=%u num_planes=%u, flags=%08x\n",
+ prt_names(p->type, v4l2_type_names), p->index, p->first_plane,
+ p->num_planes, p->flags);
+ for (i = p->first_plane; i < p->first_plane + p->num_planes; ++i)
+ pr_debug("plane %u: fd=%d\n", i, p->fds[i]);
+}
+
static void v4l_print_create_buffers(const void *arg, bool write_only)
{
const struct v4l2_create_buffers *p = arg;
@@ -602,6 +633,15 @@ static void v4l_print_create_buffers(const void *arg, bool write_only)
v4l_print_format(&p->format, write_only);
}
+static void v4l_print_ext_create_buffers(const void *arg, bool write_only)
+{
+ const struct v4l2_ext_create_buffers *p = arg;
+
+ pr_cont("index=%d, count=%d, memory=%s, ", p->index, p->count,
+ prt_names(p->memory, v4l2_memory_names));
+ v4l_print_ext_format(&p->format, write_only);
+}
+
static void v4l_print_streamparm(const void *arg, bool write_only)
{
const struct v4l2_streamparm *p = arg;
@@ -1323,6 +1363,123 @@ int v4l2_format_to_ext_format(const struct v4l2_format *f,
}
EXPORT_SYMBOL_GPL(v4l2_format_to_ext_format);
+int v4l2_ext_buffer_to_buffer(const struct v4l2_ext_buffer *e,
+ struct v4l2_buffer *b, bool mplane_cap)
+{
+ u64 nsecs;
+
+ if (!mplane_cap && e->num_planes > 1)
+ return -EINVAL;
+
+ memset(b, 0, sizeof(*b));
+
+ b->index = e->index;
+ b->flags = e->flags;
+ b->field = e->field;
+ b->sequence = e->sequence;
+ b->memory = e->memory;
+ b->request_fd = e->request_fd;
+ b->timestamp.tv_sec = div64_u64_rem(e->timestamp, NSEC_PER_SEC, &nsecs);
+ b->timestamp.tv_usec = (u32)nsecs / NSEC_PER_USEC;
+ if (mplane_cap) {
+ unsigned int i;
+
+ if (e->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ b->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+ else
+ b->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+
+ b->length = e->num_planes;
+ for (i = 0; i < e->num_planes; i++) {
+ if (b->memory == V4L2_MEMORY_DMABUF) {
+ if (e->planes[i].m.dmabuf.offset)
+ return -EINVAL;
+
+ b->m.planes[i].m.fd = e->planes[i].m.dmabuf.fd;
+ } else {
+ b->m.planes[i].m.userptr = e->planes[i].m.userptr;
+ }
+ b->m.planes[i].length = e->planes[i].length;
+ b->m.planes[i].bytesused = e->planes[i].bytesused;
+ b->m.planes[i].data_offset = e->planes[i].data_offset;
+ memset(b->m.planes[i].reserved, 0,
+ sizeof(b->m.planes[i].reserved));
+ }
+ } else {
+ b->type = e->type;
+ b->bytesused = e->planes[0].bytesused;
+ b->length = e->planes[0].length;
+ if (b->memory == V4L2_MEMORY_DMABUF) {
+ if (e->planes[0].m.dmabuf.offset)
+ return -EINVAL;
+
+ b->m.fd = e->planes[0].m.dmabuf.fd;
+ } else {
+ b->m.userptr = e->planes[0].m.userptr;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_ext_buffer_to_buffer);
+
+int v4l2_buffer_to_ext_buffer(const struct v4l2_buffer *b,
+ struct v4l2_ext_buffer *e)
+{
+ memset(e, 0, sizeof(*e));
+
+ e->index = b->index;
+ e->flags = b->flags;
+ e->field = b->field;
+ e->sequence = b->sequence;
+ e->memory = b->memory;
+ e->request_fd = b->request_fd;
+ e->timestamp = b->timestamp.tv_sec * NSEC_PER_SEC +
+ b->timestamp.tv_usec * NSEC_PER_USEC;
+ if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
+ unsigned int i;
+
+ if (!b->m.planes)
+ return -EINVAL;
+
+ if (b->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+ e->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ else
+ e->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+ e->num_planes = b->length;
+ for (i = 0; i < e->num_planes; i++) {
+ if (b->memory == V4L2_MEMORY_DMABUF) {
+ e->planes[i].m.dmabuf.fd = b->m.planes[i].m.fd;
+ e->planes[i].m.dmabuf.offset = 0;
+ } else {
+ e->planes[i].m.userptr = b->m.planes[i].m.userptr;
+ }
+ e->planes[i].length = b->m.planes[i].length;
+ e->planes[i].bytesused = b->m.planes[i].bytesused;
+ e->planes[i].data_offset = b->m.planes[i].data_offset;
+ memset(e->planes[i].reserved, 0,
+ sizeof(e->planes[i].reserved));
+ }
+ } else {
+ e->type = b->type;
+ e->num_planes = 1;
+ e->planes[0].bytesused = b->bytesused;
+ e->planes[0].length = b->length;
+ if (b->memory == V4L2_MEMORY_DMABUF) {
+ e->planes[0].m.dmabuf.fd = b->m.fd;
+ e->planes[0].m.dmabuf.offset = 0;
+ } else {
+ e->planes[0].m.userptr = b->m.userptr;
+ }
+ e->planes[0].m.userptr = b->m.userptr;
+ e->planes[0].data_offset = 0;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_buffer_to_ext_buffer);
+
static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
struct file *file, void *fh, void *arg)
{
@@ -2474,31 +2631,109 @@ static int v4l_reqbufs(const struct v4l2_ioctl_ops *ops,
return ops->vidioc_reqbufs(file, fh, p);
}
-static int v4l_querybuf(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+static int v4l_do_buf_op(int (*op)(struct file *, void *,
+ struct v4l2_buffer *),
+ int (*ext_op)(struct file *, void *,
+ struct v4l2_ext_buffer *),
+ struct file *file, void *fh, struct v4l2_buffer *b)
{
- struct v4l2_buffer *p = arg;
- int ret = check_fmt(file, p->type);
+ struct v4l2_ext_buffer eb;
+ int ret;
- return ret ? ret : ops->vidioc_querybuf(file, fh, p);
+ ret = check_fmt(file, b->type);
+ if (ret)
+ return ret;
+
+ if (op)
+ return op(file, fh, b);
+
+ ret = v4l2_buffer_to_ext_buffer(b, &eb);
+ if (ret)
+ return ret;
+
+ ret = ext_op(file, fh, &eb);
+ if (ret)
+ return ret;
+
+ v4l2_ext_buffer_to_buffer(&eb, b, V4L2_TYPE_IS_MULTIPLANAR(b->type));
+ return 0;
+}
+
+static int v4l_do_ext_buf_op(int (*op)(struct file *, void *,
+ struct v4l2_buffer *),
+ int (*ext_op)(struct file *, void *,
+ struct v4l2_ext_buffer *),
+ struct file *file, void *fh,
+ struct v4l2_ext_buffer *eb)
+{
+ struct video_device *vdev = video_devdata(file);
+ struct v4l2_buffer b;
+ bool mplane_cap;
+ int ret;
+
+ ret = check_fmt(file, eb->type);
+ if (ret)
+ return ret;
+
+ if (ext_op)
+ return ext_op(file, fh, eb);
+
+ mplane_cap = !!(vdev->device_caps &
+ (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+ V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+ V4L2_CAP_VIDEO_M2M_MPLANE));
+ ret = v4l2_ext_buffer_to_buffer(eb, &b, mplane_cap);
+ if (ret)
+ return ret;
+
+ ret = op(file, fh, &b);
+ if (ret)
+ return ret;
+
+ v4l2_buffer_to_ext_buffer(&b, eb);
+ return 0;
+}
+
+static int v4l_querybuf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_buf_op(ops->vidioc_querybuf, ops->vidioc_ext_querybuf,
+ file, fh, arg);
+}
+
+static int v4l_ext_querybuf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_ext_buf_op(ops->vidioc_querybuf,
+ ops->vidioc_ext_querybuf, file, fh, arg);
}
static int v4l_qbuf(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+ struct file *file, void *fh, void *arg)
{
- struct v4l2_buffer *p = arg;
- int ret = check_fmt(file, p->type);
+ return v4l_do_buf_op(ops->vidioc_qbuf, ops->vidioc_ext_qbuf,
+ file, fh, arg);
+}
- return ret ? ret : ops->vidioc_qbuf(file, fh, p);
+static int v4l_ext_qbuf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_ext_buf_op(ops->vidioc_qbuf, ops->vidioc_ext_qbuf,
+ file, fh, arg);
}
static int v4l_dqbuf(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+ struct file *file, void *fh, void *arg)
{
- struct v4l2_buffer *p = arg;
- int ret = check_fmt(file, p->type);
+ return v4l_do_buf_op(ops->vidioc_dqbuf, ops->vidioc_ext_dqbuf,
+ file, fh, arg);
+}
- return ret ? ret : ops->vidioc_dqbuf(file, fh, p);
+static int v4l_ext_dqbuf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_ext_buf_op(ops->vidioc_dqbuf, ops->vidioc_ext_dqbuf,
+ file, fh, arg);
}
static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
@@ -2514,7 +2749,27 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
v4l_sanitize_format(&create->format);
- ret = ops->vidioc_create_bufs(file, fh, create);
+ if (ops->vidioc_create_bufs) {
+ ret = ops->vidioc_create_bufs(file, fh, create);
+ } else {
+ struct v4l2_ext_create_buffers ecreate = {
+ .count = create->count,
+ .memory = create->memory,
+ };
+
+ ret = v4l2_format_to_ext_format(&create->format,
+ &ecreate.format, true);
+ if (ret)
+ return ret;
+
+ ret = ops->vidioc_ext_create_bufs(file, fh, &ecreate);
+ if (ret)
+ return ret;
+
+ create->index = ecreate.index;
+ create->count = ecreate.count;
+ create->capabilities = ecreate.capabilities;
+ }
if (create->format.type == V4L2_BUF_TYPE_VIDEO_CAPTURE ||
create->format.type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
@@ -2523,13 +2778,59 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
return ret;
}
-static int v4l_prepare_buf(const struct v4l2_ioctl_ops *ops,
- struct file *file, void *fh, void *arg)
+static int v4l_ext_create_bufs(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
{
- struct v4l2_buffer *b = arg;
- int ret = check_fmt(file, b->type);
+ struct v4l2_ext_create_buffers *ecreate = arg;
+ struct video_device *vdev = video_devdata(file);
+ struct v4l2_create_buffers create = {
+ .count = ecreate->count,
+ .memory = ecreate->memory,
+ };
+ bool mplane_cap;
+ int ret;
- return ret ? ret : ops->vidioc_prepare_buf(file, fh, b);
+ ret = check_fmt(file, ecreate->format.type);
+ if (ret)
+ return ret;
+
+ if (ops->vidioc_ext_create_bufs)
+ return ops->vidioc_ext_create_bufs(file, fh, ecreate);
+
+ mplane_cap = !!(vdev->device_caps &
+ (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
+ V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+ V4L2_CAP_VIDEO_M2M_MPLANE));
+ ret = v4l2_ext_format_to_format(&ecreate->format,
+ &create.format, mplane_cap, true);
+ if (ret)
+ return ret;
+
+ ret = v4l_create_bufs(ops, file, fh, &create);
+ if (ret)
+ return ret;
+
+ ecreate->index = create.index;
+ ecreate->count = create.count;
+ ecreate->capabilities = create.capabilities;
+
+ return 0;
+}
+
+static int v4l_prepare_buf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_buf_op(ops->vidioc_prepare_buf,
+ ops->vidioc_ext_prepare_buf,
+ file, fh, arg);
+}
+
+static int v4l_ext_prepare_buf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ return v4l_do_ext_buf_op(ops->vidioc_prepare_buf,
+ ops->vidioc_ext_prepare_buf,
+ file, fh, arg);
}
static int v4l_g_parm(const struct v4l2_ioctl_ops *ops,
@@ -3121,6 +3422,86 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops,
return -ENOTTY;
}
+static int v4l_expbuf(const struct v4l2_ioctl_ops *ops, struct file *file,
+ void *fh, void *arg)
+{
+ struct v4l2_exportbuffer *b = arg;
+ struct v4l2_ext_exportbuffer eb = {
+ .type = b->type,
+ .index = b->index,
+ .first_plane = b->plane,
+ .num_planes = 1,
+ .flags = b->flags,
+ };
+ int ret;
+
+ if (ops->vidioc_expbuf)
+ return ops->vidioc_expbuf(file, fh, b);
+
+ if (b->plane >= VIDEO_MAX_PLANES)
+ return -EINVAL;
+
+ ret = ops->vidioc_ext_expbuf(file, fh, &eb);
+ if (ret)
+ return ret;
+
+ b->fd = eb.fds[b->plane];
+ return 0;
+}
+
+static int v4l_ext_expbuf(const struct v4l2_ioctl_ops *ops,
+ struct file *file, void *fh, void *arg)
+{
+ struct v4l2_ext_exportbuffer *eb = arg;
+ unsigned int i;
+ int ret;
+
+ if (eb->first_plane >= VIDEO_MAX_PLANES ||
+ eb->num_planes > VIDEO_MAX_PLANES ||
+ eb->first_plane + eb->num_planes > VIDEO_MAX_PLANES)
+ return -EINVAL;
+
+ if (ops->vidioc_ext_expbuf)
+ return ops->vidioc_ext_expbuf(file, fh, eb);
+
+ for (i = eb->first_plane; i < eb->first_plane + eb->num_planes; i++) {
+ struct v4l2_exportbuffer b = {
+ .type = eb->type,
+ .index = eb->index,
+ .plane = i,
+ .flags = eb->flags,
+ };
+
+ ret = ops->vidioc_expbuf(file, fh, &b);
+ if (ret)
+ goto err_put_dmabufs;
+
+ eb->fds[i] = b.fd;
+ }
+
+ return 0;
+
+err_put_dmabufs:
+ for (i = eb->first_plane; i < eb->first_plane + eb->num_planes; i++) {
+ struct dma_buf *dmabuf;
+
+ if (eb->fds[i] <= 0)
+ break;
+
+ /*
+ * We must call dma_buf_put() twice because we got one
+ * reference taken at dmabuf creation time one taken when
+ * calling dma_buf_get().
+ * FIXME: not entirely sure this works correctly.
+ */
+ dmabuf = dma_buf_get(eb->fds[i]);
+ dma_buf_put(dmabuf);
+ dma_buf_put(dmabuf);
+ }
+
+ return ret;
+}
+
struct v4l2_ioctl_info {
unsigned int ioctl;
u32 flags;
@@ -3163,7 +3544,6 @@ struct v4l2_ioctl_info {
DEFINE_V4L_STUB_FUNC(g_fbuf)
DEFINE_V4L_STUB_FUNC(s_fbuf)
-DEFINE_V4L_STUB_FUNC(expbuf)
DEFINE_V4L_STUB_FUNC(g_std)
DEFINE_V4L_STUB_FUNC(g_audio)
DEFINE_V4L_STUB_FUNC(s_audio)
@@ -3199,12 +3579,16 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
IOCTL_INFO(VIDIOC_S_EXT_FMT, v4l_s_ext_fmt, v4l_print_ext_format, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_REQBUFS, v4l_reqbufs, v4l_print_requestbuffers, INFO_FL_PRIO | INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_QUERYBUF, v4l_querybuf, v4l_print_buffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_buffer, length)),
+ IOCTL_INFO(VIDIOC_EXT_QUERYBUF, v4l_ext_querybuf, v4l_print_ext_buffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_ext_buffer, num_planes)),
IOCTL_INFO(VIDIOC_G_FBUF, v4l_stub_g_fbuf, v4l_print_framebuffer, 0),
IOCTL_INFO(VIDIOC_S_FBUF, v4l_stub_s_fbuf, v4l_print_framebuffer, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_OVERLAY, v4l_overlay, v4l_print_u32, INFO_FL_PRIO),
IOCTL_INFO(VIDIOC_QBUF, v4l_qbuf, v4l_print_buffer, INFO_FL_QUEUE),
- IOCTL_INFO(VIDIOC_EXPBUF, v4l_stub_expbuf, v4l_print_exportbuffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_exportbuffer, flags)),
+ IOCTL_INFO(VIDIOC_EXT_QBUF, v4l_ext_qbuf, v4l_print_ext_buffer, INFO_FL_QUEUE),
+ IOCTL_INFO(VIDIOC_EXPBUF, v4l_expbuf, v4l_print_exportbuffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_exportbuffer, flags)),
+ IOCTL_INFO(VIDIOC_EXT_EXPBUF, v4l_ext_expbuf, v4l_print_ext_exportbuffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_exportbuffer, flags)),
IOCTL_INFO(VIDIOC_DQBUF, v4l_dqbuf, v4l_print_buffer, INFO_FL_QUEUE),
+ IOCTL_INFO(VIDIOC_EXT_DQBUF, v4l_ext_dqbuf, v4l_print_ext_buffer, INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_STREAMON, v4l_streamon, v4l_print_buftype, INFO_FL_PRIO | INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_STREAMOFF, v4l_streamoff, v4l_print_buftype, INFO_FL_PRIO | INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_G_PARM, v4l_g_parm, v4l_print_streamparm, INFO_FL_CLEAR(v4l2_streamparm, type)),
@@ -3269,7 +3653,9 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
IOCTL_INFO(VIDIOC_SUBSCRIBE_EVENT, v4l_subscribe_event, v4l_print_event_subscription, 0),
IOCTL_INFO(VIDIOC_UNSUBSCRIBE_EVENT, v4l_unsubscribe_event, v4l_print_event_subscription, 0),
IOCTL_INFO(VIDIOC_CREATE_BUFS, v4l_create_bufs, v4l_print_create_buffers, INFO_FL_PRIO | INFO_FL_QUEUE),
+ IOCTL_INFO(VIDIOC_EXT_CREATE_BUFS, v4l_ext_create_bufs, v4l_print_ext_create_buffers, INFO_FL_PRIO | INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_PREPARE_BUF, v4l_prepare_buf, v4l_print_buffer, INFO_FL_QUEUE),
+ IOCTL_INFO(VIDIOC_EXT_PREPARE_BUF, v4l_ext_prepare_buf, v4l_print_ext_buffer, INFO_FL_QUEUE),
IOCTL_INFO(VIDIOC_ENUM_DV_TIMINGS, v4l_stub_enum_dv_timings, v4l_print_enum_dv_timings, INFO_FL_CLEAR(v4l2_enum_dv_timings, pad)),
IOCTL_INFO(VIDIOC_QUERY_DV_TIMINGS, v4l_stub_query_dv_timings, v4l_print_dv_timings, INFO_FL_ALWAYS_COPY),
IOCTL_INFO(VIDIOC_DV_TIMINGS_CAP, v4l_stub_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, pad)),
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index a1fb5eac144b..881888861a5d 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -168,16 +168,28 @@ struct v4l2_fh;
* :ref:`VIDIOC_REQBUFS <vidioc_reqbufs>` ioctl
* @vidioc_querybuf: pointer to the function that implements
* :ref:`VIDIOC_QUERYBUF <vidioc_querybuf>` ioctl
+ * @vidioc_ext_querybuf: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_QUERYBUF <vidioc_ext_querybuf>` ioctl
* @vidioc_qbuf: pointer to the function that implements
* :ref:`VIDIOC_QBUF <vidioc_qbuf>` ioctl
+ * @vidioc_ext_qbuf: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_QBUF <vidioc_ext_qbuf>` ioctl
* @vidioc_expbuf: pointer to the function that implements
* :ref:`VIDIOC_EXPBUF <vidioc_expbuf>` ioctl
+ * @vidioc_ext_expbuf: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_EXPBUF <vidioc_ext_expbuf>` ioctl
* @vidioc_dqbuf: pointer to the function that implements
* :ref:`VIDIOC_DQBUF <vidioc_qbuf>` ioctl
+ * @vidioc_ext_dqbuf: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_DQBUF <vidioc_ext_qbuf>` ioctl
* @vidioc_create_bufs: pointer to the function that implements
* :ref:`VIDIOC_CREATE_BUFS <vidioc_create_bufs>` ioctl
+ * @vidioc_ext_create_bufs: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_CREATE_BUFS <vidioc_ext_create_bufs>` ioctl
* @vidioc_prepare_buf: pointer to the function that implements
* :ref:`VIDIOC_PREPARE_BUF <vidioc_prepare_buf>` ioctl
+ * @vidioc_ext_prepare_buf: pointer to the function that implements
+ * :ref:`VIDIOC_EXT_PREPARE_BUF <vidioc_ext_prepare_buf>` ioctl
* @vidioc_overlay: pointer to the function that implements
* :ref:`VIDIOC_OVERLAY <vidioc_overlay>` ioctl
* @vidioc_g_fbuf: pointer to the function that implements
@@ -438,17 +450,29 @@ struct v4l2_ioctl_ops {
struct v4l2_requestbuffers *b);
int (*vidioc_querybuf)(struct file *file, void *fh,
struct v4l2_buffer *b);
+ int (*vidioc_ext_querybuf)(struct file *file, void *fh,
+ struct v4l2_ext_buffer *b);
int (*vidioc_qbuf)(struct file *file, void *fh,
struct v4l2_buffer *b);
+ int (*vidioc_ext_qbuf)(struct file *file, void *fh,
+ struct v4l2_ext_buffer *b);
int (*vidioc_expbuf)(struct file *file, void *fh,
struct v4l2_exportbuffer *e);
+ int (*vidioc_ext_expbuf)(struct file *file, void *fh,
+ struct v4l2_ext_exportbuffer *e);
int (*vidioc_dqbuf)(struct file *file, void *fh,
struct v4l2_buffer *b);
+ int (*vidioc_ext_dqbuf)(struct file *file, void *fh,
+ struct v4l2_ext_buffer *b);
int (*vidioc_create_bufs)(struct file *file, void *fh,
struct v4l2_create_buffers *b);
+ int (*vidioc_ext_create_bufs)(struct file *file, void *fh,
+ struct v4l2_ext_create_buffers *b);
int (*vidioc_prepare_buf)(struct file *file, void *fh,
struct v4l2_buffer *b);
+ int (*vidioc_ext_prepare_buf)(struct file *file, void *fh,
+ struct v4l2_ext_buffer *b);
int (*vidioc_overlay)(struct file *file, void *fh, unsigned int i);
int (*vidioc_g_fbuf)(struct file *file, void *fh,
@@ -755,4 +779,10 @@ int v4l2_ext_format_to_format(const struct v4l2_ext_format *e,
struct v4l2_format *f,
bool mplane_cap, bool strict);
+int v4l2_ext_buffer_to_buffer(const struct v4l2_ext_buffer *e,
+ struct v4l2_buffer *b,
+ bool mplane_cap);
+int v4l2_buffer_to_ext_buffer(const struct v4l2_buffer *b,
+ struct v4l2_ext_buffer *e);
+
#endif /* _V4L2_IOCTL_H */
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index b32c4a10c46f..0e3b5f78e3dd 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -928,6 +928,49 @@ struct v4l2_plane {
__u32 reserved[11];
};
+/**
+ * struct v4l2_ext_plane - extended plane buffer info
+ * @bytesused: number of bytes occupied by data in the plane (payload)
+ * @length: size of this plane (NOT the payload) in bytes
+ * @mem_offset: when memory in the associated struct v4l2_ext_buffer is
+ * V4L2_MEMORY_MMAP, equals the offset from the start of the
+ * device memory for this plane (or is a "cookie" that should be
+ * passed to mmap() called on the video node)
+ * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer pointing
+ * to this plane
+ * @dmabuf.fd: when memory is V4L2_MEMORY_DMABUF, a userspace file descriptor
+ * associated with this plane
+ * @dmabuf.offset: where the plane starts inside the DMABUF buffer. All planes
+ * might share the same buffer object. In this case we need to
+ * know where the plane start inside this buffer.
+ * @data_offset: offset in the plane to the start of data; usually 0, unless
+ * there is a header in front of the data. data_offset is
+ * relative to start_offset, so absolute data_offset is actually
+ * start_offset + data_offset
+ *
+ *
+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
+ * with two planes can have one plane for Y, and another for interleaved CbCr
+ * components. Each plane can reside in a separate memory buffer, or even in
+ * a completely separate memory node (e.g. in embedded devices).
+ * Note that this struct is also used for uni-planar buffers, but in that case
+ * you'll only have one plane defined.
+ */
+struct v4l2_ext_plane {
+ __u32 bytesused;
+ __u32 length;
+ union {
+ __u32 mem_offset;
+ __u64 userptr;
+ struct {
+ __s32 fd;
+ __u32 offset;
+ } dmabuf;
+ } m;
+ __u32 data_offset;
+ __u32 reserved[10];
+};
+
/**
* struct v4l2_buffer - video buffer info
* @index: id number of the buffer
@@ -985,6 +1028,40 @@ struct v4l2_buffer {
};
};
+/**
+ * struct v4l2_ext_buffer - extended video buffer info
+ * @index: id number of the buffer
+ * @type: enum v4l2_buf_type; buffer type. _MPLANE and _OVERLAY formats are
+ * invalid
+ * @flags: buffer informational flags
+ * @field: enum v4l2_field; field order of the image in the buffer
+ * @timestamp: frame timestamp
+ * @sequence: sequence count of this frame
+ * @memory: enum v4l2_memory; the method, in which the actual video data is
+ * passed
+ * @planes: per-plane buffer information
+ * @num_planes: number of plane buffers
+ * @request_fd: fd of the request that this buffer should use
+ * @reserved: some extra space reserved to add future fields (like timecode).
+ * Must be set to 0
+ *
+ * Contains data exchanged by application and driver using one of the Streaming
+ * I/O methods.
+ */
+struct v4l2_ext_buffer {
+ __u32 index;
+ __u32 type;
+ __u32 flags;
+ __u32 field;
+ __u64 timestamp;
+ __u32 sequence;
+ __u32 memory;
+ struct v4l2_ext_plane planes[VIDEO_MAX_PLANES];
+ __u32 num_planes;
+ __u32 request_fd;
+ __u32 reserved[10];
+};
+
/**
* v4l2_timeval_to_ns - Convert timeval to nanoseconds
* @ts: pointer to the timeval variable to be converted
@@ -1062,6 +1139,35 @@ struct v4l2_exportbuffer {
__u32 reserved[11];
};
+/**
+ * struct v4l2_ext_exportbuffer - export of video buffer as DMABUF file
+ * descriptor using extended format
+ *
+ * @index: id number of the buffer
+ * @type: enum v4l2_buf_type; buffer type
+ * @flags: flags for newly created file(s), currently only O_CLOEXEC is
+ * supported, refer to manual of open syscall for more details
+ * @first_plane: first plane to export. Most likely set to 0
+ * @num_planes: number of planes to export. Most set to the number of planes
+ * attached to the buffer
+ * @fds: file descriptors associated with DMABUF (set by driver). Note that all
+ * planes might share the same buffer and then be returned the same FD
+ *
+ * Contains data used for exporting a video buffer as DMABUF file descriptor.
+ * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF
+ * (identical to the cookie used to mmap() the buffer to userspace). All
+ * reserved fields must be set to zero.
+ */
+struct v4l2_ext_exportbuffer {
+ __u32 type; /* enum v4l2_buf_type */
+ __u32 index;
+ __u32 flags;
+ __u32 first_plane;
+ __u32 num_planes;
+ __s32 fds[VIDEO_MAX_PLANES];
+ __u32 reserved;
+};
+
/*
* O V E R L A Y P R E V I E W
*/
@@ -2458,6 +2564,23 @@ struct v4l2_create_buffers {
__u32 reserved[7];
};
+/**
+ * struct v4l2_ext_create_buffers - VIDIOC_EXT_CREATE_BUFS argument
+ * @index: on return, index of the first created buffer
+ * @count: entry: number of requested buffers,
+ * return: number of created buffers
+ * @memory: enum v4l2_memory; buffer memory type
+ * @capabilities: capabilities of this buffer type.
+ * @format: frame format, for which buffers are requested
+ */
+struct v4l2_ext_create_buffers {
+ __u32 index;
+ __u32 count;
+ __u32 memory;
+ __u32 capabilities;
+ struct v4l2_ext_format format;
+};
+
/*
* I O C T L C O D E S F O R V I D E O D E V I C E S
*
@@ -2561,6 +2684,13 @@ struct v4l2_create_buffers {
#define VIDIOC_G_EXT_FMT _IOWR('V', 104, struct v4l2_ext_format)
#define VIDIOC_S_EXT_FMT _IOWR('V', 105, struct v4l2_ext_format)
#define VIDIOC_TRY_EXT_FMT _IOWR('V', 106, struct v4l2_ext_format)
+#define VIDIOC_EXT_CREATE_BUFS _IOWR('V', 107, struct v4l2_ext_create_buffers)
+#define VIDIOC_EXT_QUERYBUF _IOWR('V', 108, struct v4l2_ext_buffer)
+#define VIDIOC_EXT_QBUF _IOWR('V', 109, struct v4l2_ext_buffer)
+#define VIDIOC_EXT_DQBUF _IOWR('V', 110, struct v4l2_ext_buffer)
+#define VIDIOC_EXT_PREPARE_BUF _IOWR('V', 111, struct v4l2_ext_buffer)
+#define VIDIOC_EXT_EXPBUF _IOWR('V', 112, struct v4l2_ext_exportbuffer)
+
/* Reminder: when adding new ioctls please add support for them to
drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 4/7] media: videobuf2: Expose helpers to implement the _ext_fmt and _ext_buf hooks
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
` (2 preceding siblings ...)
2019-04-04 8:16 ` [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 5/7] media: mediabus: Add an helper to convert a ext_pix format to an mbus_fmt Boris Brezillon
` (3 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
The VB2 layer is used by a lot of drivers. Patch it to support the
_EXT_FMT and _EXT_BUF ioctls in order to ease conversion of existing
drivers to these new APIs.
Note that internally, the VB2 core is now only using ext structs and old
APIs are supported through conversion wrappers.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- New patch
---
.../media/common/videobuf2/videobuf2-core.c | 2 +
.../media/common/videobuf2/videobuf2-v4l2.c | 534 +++++++++++-------
include/media/videobuf2-core.h | 6 +-
include/media/videobuf2-v4l2.h | 26 +-
4 files changed, 352 insertions(+), 216 deletions(-)
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 15b6b9c0a2e4..063b00c622d2 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -1176,6 +1176,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
vb->planes[plane].length = 0;
vb->planes[plane].m.fd = 0;
vb->planes[plane].data_offset = 0;
+ vb->planes[plane].dbuf_offset = 0;
/* Acquire each plane's memory */
mem_priv = call_ptr_memop(vb, attach_dmabuf,
@@ -1219,6 +1220,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
vb->planes[plane].length = planes[plane].length;
vb->planes[plane].m.fd = planes[plane].m.fd;
vb->planes[plane].data_offset = planes[plane].data_offset;
+ vb->planes[plane].dbuf_offset = planes[plane].dbuf_offset;
}
if (reacquired) {
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index d09dee20e421..848f9ff016ec 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -29,6 +29,7 @@
#include <media/v4l2-fh.h>
#include <media/v4l2-event.h>
#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
#include <media/videobuf2-v4l2.h>
@@ -54,22 +55,14 @@ module_param(debug, int, 0644);
/*
* __verify_planes_array() - verify that the planes array passed in struct
- * v4l2_buffer from userspace can be safely used
+ * v4l2_ext_buffer from userspace can be safely used
*/
-static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer *b)
+static int __verify_planes_array(struct vb2_buffer *vb,
+ const struct v4l2_ext_buffer *b)
{
- if (!V4L2_TYPE_IS_MULTIPLANAR(b->type))
- return 0;
-
- /* Is memory for copying plane information present? */
- if (b->m.planes == NULL) {
- dprintk(1, "multi-planar buffer passed but planes array not provided\n");
- return -EINVAL;
- }
-
- if (b->length < vb->num_planes || b->length > VB2_MAX_PLANES) {
+ if (b->num_planes < vb->num_planes || b->num_planes > VB2_MAX_PLANES) {
dprintk(1, "incorrect planes array length, expected %d, got %d\n",
- vb->num_planes, b->length);
+ vb->num_planes, b->num_planes);
return -EINVAL;
}
@@ -85,7 +78,8 @@ static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb)
* __verify_length() - Verify that the bytesused value for each plane fits in
* the plane length and that the data offset doesn't exceed the bytesused value.
*/
-static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
+static int __verify_length(struct vb2_buffer *vb,
+ const struct v4l2_ext_buffer *b)
{
unsigned int length;
unsigned int bytesused;
@@ -94,27 +88,19 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
if (!V4L2_TYPE_IS_OUTPUT(b->type))
return 0;
- if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
- for (plane = 0; plane < vb->num_planes; ++plane) {
- length = (b->memory == VB2_MEMORY_USERPTR ||
- b->memory == VB2_MEMORY_DMABUF)
- ? b->m.planes[plane].length
- : vb->planes[plane].length;
- bytesused = b->m.planes[plane].bytesused
- ? b->m.planes[plane].bytesused : length;
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ length = (b->memory == VB2_MEMORY_USERPTR ||
+ b->memory == VB2_MEMORY_DMABUF) ?
+ b->planes[plane].length :
+ vb->planes[plane].length;
+ bytesused = b->planes[plane].bytesused ?
+ b->planes[plane].bytesused : length;
- if (b->m.planes[plane].bytesused > length)
- return -EINVAL;
+ if (b->planes[plane].bytesused > length)
+ return -EINVAL;
- if (b->m.planes[plane].data_offset > 0 &&
- b->m.planes[plane].data_offset >= bytesused)
- return -EINVAL;
- }
- } else {
- length = (b->memory == VB2_MEMORY_USERPTR)
- ? b->length : vb->planes[0].length;
-
- if (b->bytesused > length)
+ if (b->planes[plane].data_offset > 0 &&
+ b->planes[plane].data_offset >= bytesused)
return -EINVAL;
}
@@ -133,21 +119,12 @@ static void __init_v4l2_vb2_buffer(struct vb2_buffer *vb)
static void __copy_timestamp(struct vb2_buffer *vb, const void *pb)
{
- const struct v4l2_buffer *b = pb;
- struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+ const struct v4l2_ext_buffer *b = pb;
struct vb2_queue *q = vb->vb2_queue;
- if (q->is_output) {
- /*
- * For output buffers copy the timestamp if needed,
- * and the timecode field and flag if needed.
- */
- if (q->copy_timestamp)
- vb->timestamp = v4l2_timeval_to_ns(&b->timestamp);
- vbuf->flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
- if (b->flags & V4L2_BUF_FLAG_TIMECODE)
- vbuf->timecode = b->timecode;
- }
+ /* For output buffers copy the timestamp if needed. */
+ if (q->is_output && q->copy_timestamp)
+ vb->timestamp = b->timestamp;
};
static void vb2_warn_zero_bytesused(struct vb2_buffer *vb)
@@ -166,7 +143,8 @@ static void vb2_warn_zero_bytesused(struct vb2_buffer *vb)
pr_warn("use the actual size instead.\n");
}
-static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
+static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb,
+ struct v4l2_ext_buffer *b)
{
struct vb2_queue *q = vb->vb2_queue;
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
@@ -195,110 +173,61 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
vbuf->sequence = 0;
vbuf->request_fd = -1;
- if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
- switch (b->memory) {
- case VB2_MEMORY_USERPTR:
- for (plane = 0; plane < vb->num_planes; ++plane) {
- planes[plane].m.userptr =
- b->m.planes[plane].m.userptr;
- planes[plane].length =
- b->m.planes[plane].length;
- }
- break;
- case VB2_MEMORY_DMABUF:
- for (plane = 0; plane < vb->num_planes; ++plane) {
- planes[plane].m.fd =
- b->m.planes[plane].m.fd;
- planes[plane].length =
- b->m.planes[plane].length;
- }
- break;
- default:
- for (plane = 0; plane < vb->num_planes; ++plane) {
- planes[plane].m.offset =
- vb->planes[plane].m.offset;
- planes[plane].length =
- vb->planes[plane].length;
- }
- break;
+ switch (b->memory) {
+ case VB2_MEMORY_USERPTR:
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ planes[plane].m.userptr = b->planes[plane].m.userptr;
+ planes[plane].length = b->planes[plane].length;
}
-
- /* Fill in driver-provided information for OUTPUT types */
- if (V4L2_TYPE_IS_OUTPUT(b->type)) {
- /*
- * Will have to go up to b->length when API starts
- * accepting variable number of planes.
- *
- * If bytesused == 0 for the output buffer, then fall
- * back to the full buffer size. In that case
- * userspace clearly never bothered to set it and
- * it's a safe assumption that they really meant to
- * use the full plane sizes.
- *
- * Some drivers, e.g. old codec drivers, use bytesused == 0
- * as a way to indicate that streaming is finished.
- * In that case, the driver should use the
- * allow_zero_bytesused flag to keep old userspace
- * applications working.
- */
- for (plane = 0; plane < vb->num_planes; ++plane) {
- struct vb2_plane *pdst = &planes[plane];
- struct v4l2_plane *psrc = &b->m.planes[plane];
-
- if (psrc->bytesused == 0)
- vb2_warn_zero_bytesused(vb);
-
- if (vb->vb2_queue->allow_zero_bytesused)
- pdst->bytesused = psrc->bytesused;
- else
- pdst->bytesused = psrc->bytesused ?
- psrc->bytesused : pdst->length;
- pdst->data_offset = psrc->data_offset;
- }
+ break;
+ case VB2_MEMORY_DMABUF:
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ planes[plane].m.fd = b->planes[plane].m.dmabuf.fd;
+ planes[plane].dbuf_offset = b->planes[plane].m.dmabuf.offset;
+ planes[plane].length = b->planes[plane].length;
}
- } else {
+ break;
+ default:
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ planes[plane].m.offset = vb->planes[plane].m.offset;
+ planes[plane].length = vb->planes[plane].length;
+ }
+ break;
+ }
+
+ /* Fill in driver-provided information for OUTPUT types */
+ if (V4L2_TYPE_IS_OUTPUT(b->type)) {
/*
- * Single-planar buffers do not use planes array,
- * so fill in relevant v4l2_buffer struct fields instead.
- * In videobuf we use our internal V4l2_planes struct for
- * single-planar buffers as well, for simplicity.
+ * Will have to go up to b->length when API starts
+ * accepting variable number of planes.
*
- * If bytesused == 0 for the output buffer, then fall back
- * to the full buffer size as that's a sensible default.
+ * If bytesused == 0 for the output buffer, then fall
+ * back to the full buffer size. In that case
+ * userspace clearly never bothered to set it and
+ * it's a safe assumption that they really meant to
+ * use the full plane sizes.
*
- * Some drivers, e.g. old codec drivers, use bytesused == 0 as
- * a way to indicate that streaming is finished. In that case,
- * the driver should use the allow_zero_bytesused flag to keep
- * old userspace applications working.
+ * Some drivers, e.g. old codec drivers, use bytesused == 0
+ * as a way to indicate that streaming is finished.
+ * In that case, the driver should use the
+ * allow_zero_bytesused flag to keep old userspace
+ * applications working.
*/
- switch (b->memory) {
- case VB2_MEMORY_USERPTR:
- planes[0].m.userptr = b->m.userptr;
- planes[0].length = b->length;
- break;
- case VB2_MEMORY_DMABUF:
- planes[0].m.fd = b->m.fd;
- planes[0].length = b->length;
- break;
- default:
- planes[0].m.offset = vb->planes[0].m.offset;
- planes[0].length = vb->planes[0].length;
- break;
- }
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ struct vb2_plane *pdst = &planes[plane];
+ struct v4l2_ext_plane *psrc = &b->planes[plane];
- planes[0].data_offset = 0;
- if (V4L2_TYPE_IS_OUTPUT(b->type)) {
- if (b->bytesused == 0)
+ if (psrc->bytesused == 0)
vb2_warn_zero_bytesused(vb);
if (vb->vb2_queue->allow_zero_bytesused)
- planes[0].bytesused = b->bytesused;
+ pdst->bytesused = psrc->bytesused;
else
- planes[0].bytesused = b->bytesused ?
- b->bytesused : planes[0].length;
- } else
- planes[0].bytesused = 0;
-
+ pdst->bytesused = psrc->bytesused ?
+ psrc->bytesused :
+ pdst->length;
+ pdst->data_offset = psrc->data_offset;
+ }
}
/* Zero flags that we handle */
@@ -331,8 +260,21 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
return 0;
}
+enum v4l2_buf_type vb2_ext_qtype(struct vb2_queue *q)
+{
+ if (!q->is_multiplanar)
+ return q->type;
+
+ if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+ return V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ else if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
+ return V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+ return q->type;
+}
+
static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
- struct v4l2_buffer *b, bool is_prepare,
+ struct v4l2_ext_buffer *b, bool is_prepare,
struct media_request **p_req)
{
const char *opname = is_prepare ? "prepare_buf" : "qbuf";
@@ -341,7 +283,7 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md
struct vb2_buffer *vb;
int ret;
- if (b->type != q->type) {
+ if (b->type != vb2_ext_qtype(q)) {
dprintk(1, "%s: invalid buffer type\n", opname);
return -EINVAL;
}
@@ -453,12 +395,12 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md
}
/*
- * __fill_v4l2_buffer() - fill in a struct v4l2_buffer with information to be
- * returned to userspace
+ * __fill_v4l2_buffer() - fill in a struct v4l2_ext_buffer with information to
+ * be returned to userspace
*/
static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
{
- struct v4l2_buffer *b = pb;
+ struct v4l2_ext_buffer *b = pb;
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct vb2_queue *q = vb->vb2_queue;
unsigned int plane;
@@ -467,50 +409,35 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, void *pb)
b->index = vb->index;
b->type = vb->type;
b->memory = vb->memory;
- b->bytesused = 0;
b->flags = vbuf->flags;
b->field = vbuf->field;
- b->timestamp = ns_to_timeval(vb->timestamp);
- b->timecode = vbuf->timecode;
+ b->timestamp = vb->timestamp;
b->sequence = vbuf->sequence;
- b->reserved2 = 0;
b->request_fd = 0;
+ memset(b->reserved, 0, sizeof(b->reserved));
- if (q->is_multiplanar) {
- /*
- * Fill in plane-related data if userspace provided an array
- * for it. The caller has already verified memory and size.
- */
- b->length = vb->num_planes;
- for (plane = 0; plane < vb->num_planes; ++plane) {
- struct v4l2_plane *pdst = &b->m.planes[plane];
- struct vb2_plane *psrc = &vb->planes[plane];
+ /*
+ * Fill in plane-related data if userspace provided an array
+ * for it. The caller has already verified memory and size.
+ */
+ b->num_planes = vb->num_planes;
+ for (plane = 0; plane < vb->num_planes; ++plane) {
+ struct v4l2_ext_plane *pdst = &b->planes[plane];
+ struct vb2_plane *psrc = &vb->planes[plane];
- pdst->bytesused = psrc->bytesused;
- pdst->length = psrc->length;
- if (q->memory == VB2_MEMORY_MMAP)
- pdst->m.mem_offset = psrc->m.offset;
- else if (q->memory == VB2_MEMORY_USERPTR)
- pdst->m.userptr = psrc->m.userptr;
- else if (q->memory == VB2_MEMORY_DMABUF)
- pdst->m.fd = psrc->m.fd;
- pdst->data_offset = psrc->data_offset;
- memset(pdst->reserved, 0, sizeof(pdst->reserved));
+ pdst->bytesused = psrc->bytesused;
+ pdst->length = psrc->length;
+ if (q->memory == VB2_MEMORY_MMAP) {
+ pdst->m.mem_offset = psrc->m.offset;
+ } else if (q->memory == VB2_MEMORY_USERPTR) {
+ pdst->m.userptr = psrc->m.userptr;
+ } else if (q->memory == VB2_MEMORY_DMABUF) {
+ pdst->m.dmabuf.fd = psrc->m.fd;
+ pdst->m.dmabuf.offset = psrc->dbuf_offset;
}
- } else {
- /*
- * We use length and offset in v4l2_planes array even for
- * single-planar buffers, but userspace does not.
- */
- b->length = vb->planes[0].length;
- b->bytesused = vb->planes[0].bytesused;
- if (q->memory == VB2_MEMORY_MMAP)
- b->m.offset = vb->planes[0].m.offset;
- else if (q->memory == VB2_MEMORY_USERPTR)
- b->m.userptr = vb->planes[0].m.userptr;
- else if (q->memory == VB2_MEMORY_DMABUF)
- b->m.fd = vb->planes[0].m.fd;
+ pdst->data_offset = psrc->data_offset;
+ memset(pdst->reserved, 0, sizeof(pdst->reserved));
}
/*
@@ -611,6 +538,40 @@ int vb2_find_timestamp(const struct vb2_queue *q, u64 timestamp,
}
EXPORT_SYMBOL_GPL(vb2_find_timestamp);
+#define vb2_buf_to_ext_buf_op(_name, ...) \
+({ \
+ int ret; \
+ \
+ ret = v4l2_buffer_to_ext_buffer(b, &eb); \
+ if (!ret) \
+ ret = _name(__VA_ARGS__); \
+ if (!ret) \
+ v4l2_ext_buffer_to_buffer(&eb, b, q->is_multiplanar); \
+ ret; \
+})
+
+int vb2_ext_querybuf(struct vb2_queue *q, struct v4l2_ext_buffer *b)
+{
+ struct vb2_buffer *vb;
+ int ret;
+
+ if (b->type != vb2_ext_qtype(q)) {
+ dprintk(1, "wrong buffer type\n");
+ return -EINVAL;
+ }
+
+ if (b->index >= q->num_buffers) {
+ dprintk(1, "buffer index out of range\n");
+ return -EINVAL;
+ }
+ vb = q->bufs[b->index];
+ ret = __verify_planes_array(vb, b);
+ if (!ret)
+ vb2_core_querybuf(q, b->index, b);
+ return ret;
+}
+EXPORT_SYMBOL(vb2_ext_querybuf);
+
/*
* vb2_querybuf() - query video buffer information
* @q: videobuf queue
@@ -626,23 +587,9 @@ EXPORT_SYMBOL_GPL(vb2_find_timestamp);
*/
int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b)
{
- struct vb2_buffer *vb;
- int ret;
+ struct v4l2_ext_buffer eb;
- if (b->type != q->type) {
- dprintk(1, "wrong buffer type\n");
- return -EINVAL;
- }
-
- if (b->index >= q->num_buffers) {
- dprintk(1, "buffer index out of range\n");
- return -EINVAL;
- }
- vb = q->bufs[b->index];
- ret = __verify_planes_array(vb, b);
- if (!ret)
- vb2_core_querybuf(q, b->index, b);
- return ret;
+ return vb2_buf_to_ext_buf_op(vb2_ext_querybuf, q, &eb);
}
EXPORT_SYMBOL(vb2_querybuf);
@@ -670,8 +617,8 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
}
EXPORT_SYMBOL_GPL(vb2_reqbufs);
-int vb2_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
- struct v4l2_buffer *b)
+int vb2_ext_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_ext_buffer *b)
{
int ret;
@@ -687,13 +634,23 @@ int vb2_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
return ret ? ret : vb2_core_prepare_buf(q, b->index, b);
}
+EXPORT_SYMBOL_GPL(vb2_ext_prepare_buf);
+
+int vb2_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_buffer *b)
+{
+ struct v4l2_ext_buffer eb;
+
+ return vb2_buf_to_ext_buf_op(vb2_ext_prepare_buf, q, mdev, &eb);
+}
EXPORT_SYMBOL_GPL(vb2_prepare_buf);
-int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
+int vb2_ext_create_bufs(struct vb2_queue *q,
+ struct v4l2_ext_create_buffers *create)
{
unsigned requested_planes = 1;
unsigned requested_sizes[VIDEO_MAX_PLANES];
- struct v4l2_format *f = &create->format;
+ struct v4l2_ext_format *f = &create->format;
int ret = vb2_verify_memory_type(q, create->memory, f->type);
unsigned i;
@@ -703,19 +660,15 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
return ret != -EBUSY ? ret : 0;
switch (f->type) {
- case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
- case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
- requested_planes = f->fmt.pix_mp.num_planes;
+ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
+ requested_planes = f->fmt.pix.num_planes;
if (requested_planes == 0 ||
requested_planes > VIDEO_MAX_PLANES)
return -EINVAL;
for (i = 0; i < requested_planes; i++)
requested_sizes[i] =
- f->fmt.pix_mp.plane_fmt[i].sizeimage;
- break;
- case V4L2_BUF_TYPE_VIDEO_CAPTURE:
- case V4L2_BUF_TYPE_VIDEO_OUTPUT:
- requested_sizes[0] = f->fmt.pix.sizeimage;
+ f->fmt.pix.plane_fmt[i].sizeimage;
break;
case V4L2_BUF_TYPE_VBI_CAPTURE:
case V4L2_BUF_TYPE_VBI_OUTPUT:
@@ -743,10 +696,34 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
return ret ? ret : vb2_core_create_bufs(q, create->memory,
&create->count, requested_planes, requested_sizes);
}
+EXPORT_SYMBOL_GPL(vb2_ext_create_bufs);
+
+int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
+{
+ struct v4l2_ext_create_buffers ecreate = {
+ .count = create->count,
+ .memory = create->memory,
+ };
+ int ret;
+
+ ret = v4l2_format_to_ext_format(&create->format,
+ &ecreate.format, true);
+ if (ret)
+ return ret;
+
+ ret = vb2_ext_create_bufs(q, &ecreate);
+ if (ret)
+ return ret;
+
+ create->index = ecreate.index;
+ create->count = ecreate.count;
+ create->capabilities = ecreate.capabilities;
+ return 0;
+}
EXPORT_SYMBOL_GPL(vb2_create_bufs);
-int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
- struct v4l2_buffer *b)
+int vb2_ext_qbuf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_ext_buffer *b)
{
struct media_request *req = NULL;
int ret;
@@ -764,9 +741,19 @@ int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
media_request_put(req);
return ret;
}
+EXPORT_SYMBOL_GPL(vb2_ext_qbuf);
+
+int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_buffer *b)
+{
+ struct v4l2_ext_buffer eb;
+
+ return vb2_buf_to_ext_buf_op(vb2_ext_qbuf, q, mdev, &eb);
+}
EXPORT_SYMBOL_GPL(vb2_qbuf);
-int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
+int vb2_ext_dqbuf(struct vb2_queue *q, struct v4l2_ext_buffer *b,
+ bool nonblocking)
{
int ret;
@@ -775,7 +762,7 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
return -EBUSY;
}
- if (b->type != q->type) {
+ if (b->type != vb2_ext_qtype(q)) {
dprintk(1, "invalid buffer type\n");
return -EINVAL;
}
@@ -790,8 +777,17 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
return ret;
}
+EXPORT_SYMBOL_GPL(vb2_ext_dqbuf);
+
+int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
+{
+ struct v4l2_ext_buffer eb;
+
+ return vb2_buf_to_ext_buf_op(vb2_ext_dqbuf, q, &eb, nonblocking);
+}
EXPORT_SYMBOL_GPL(vb2_dqbuf);
+
int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type)
{
if (vb2_fileio_is_active(q)) {
@@ -819,6 +815,37 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb)
}
EXPORT_SYMBOL_GPL(vb2_expbuf);
+int vb2_ext_expbuf(struct vb2_queue *q, struct v4l2_ext_exportbuffer *eb)
+{
+ unsigned int i;
+ int ret;
+
+ for (i = eb->first_plane; i < eb->first_plane + eb->num_planes; i++) {
+ ret = vb2_core_expbuf(q, &eb->fds[i], eb->type, eb->index,
+ i, eb->flags);
+ if (ret)
+ goto err_put_dmabufs;
+ }
+
+ return 0;
+
+err_put_dmabufs:
+ for (; i > eb->first_plane; i--) {
+ struct dma_buf *dmabuf;
+
+ /*
+ * FIXME: Find a better way to close the FD returned by
+ * dma_buf_fb().
+ */
+ dmabuf = dma_buf_get(eb->fds[i - 1]);
+ dma_buf_put(dmabuf);
+ dma_buf_put(dmabuf);
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(vb2_ext_expbuf);
+
int vb2_queue_init(struct vb2_queue *q)
{
/*
@@ -945,6 +972,33 @@ int vb2_ioctl_create_bufs(struct file *file, void *priv,
}
EXPORT_SYMBOL_GPL(vb2_ioctl_create_bufs);
+int vb2_ioctl_ext_create_bufs(struct file *file, void *priv,
+ struct v4l2_ext_create_buffers *p)
+{
+ struct video_device *vdev = video_devdata(file);
+ int res = vb2_verify_memory_type(vdev->queue, p->memory,
+ p->format.type);
+
+ p->index = vdev->queue->num_buffers;
+ fill_buf_caps(vdev->queue, &p->capabilities);
+ /*
+ * If count == 0, then just check if memory and type are valid.
+ * Any -EBUSY result from vb2_verify_memory_type can be mapped to 0.
+ */
+ if (p->count == 0)
+ return res != -EBUSY ? res : 0;
+ if (res)
+ return res;
+ if (vb2_queue_is_busy(vdev, file))
+ return -EBUSY;
+
+ res = vb2_ext_create_bufs(vdev->queue, p);
+ if (res == 0)
+ vdev->queue->owner = file->private_data;
+ return res;
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_create_bufs);
+
int vb2_ioctl_prepare_buf(struct file *file, void *priv,
struct v4l2_buffer *p)
{
@@ -956,6 +1010,17 @@ int vb2_ioctl_prepare_buf(struct file *file, void *priv,
}
EXPORT_SYMBOL_GPL(vb2_ioctl_prepare_buf);
+int vb2_ioctl_ext_prepare_buf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p)
+{
+ struct video_device *vdev = video_devdata(file);
+
+ if (vb2_queue_is_busy(vdev, file))
+ return -EBUSY;
+ return vb2_ext_prepare_buf(vdev->queue, vdev->v4l2_dev->mdev, p);
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_prepare_buf);
+
int vb2_ioctl_querybuf(struct file *file, void *priv, struct v4l2_buffer *p)
{
struct video_device *vdev = video_devdata(file);
@@ -965,6 +1030,16 @@ int vb2_ioctl_querybuf(struct file *file, void *priv, struct v4l2_buffer *p)
}
EXPORT_SYMBOL_GPL(vb2_ioctl_querybuf);
+int vb2_ioctl_ext_querybuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p)
+{
+ struct video_device *vdev = video_devdata(file);
+
+ /* No need to call vb2_queue_is_busy(), anyone can query buffers. */
+ return vb2_ext_querybuf(vdev->queue, p);
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_querybuf);
+
int vb2_ioctl_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)
{
struct video_device *vdev = video_devdata(file);
@@ -975,6 +1050,17 @@ int vb2_ioctl_qbuf(struct file *file, void *priv, struct v4l2_buffer *p)
}
EXPORT_SYMBOL_GPL(vb2_ioctl_qbuf);
+int vb2_ioctl_ext_qbuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p)
+{
+ struct video_device *vdev = video_devdata(file);
+
+ if (vb2_queue_is_busy(vdev, file))
+ return -EBUSY;
+ return vb2_ext_qbuf(vdev->queue, vdev->v4l2_dev->mdev, p);
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_qbuf);
+
int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
{
struct video_device *vdev = video_devdata(file);
@@ -985,6 +1071,17 @@ int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p)
}
EXPORT_SYMBOL_GPL(vb2_ioctl_dqbuf);
+int vb2_ioctl_ext_dqbuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p)
+{
+ struct video_device *vdev = video_devdata(file);
+
+ if (vb2_queue_is_busy(vdev, file))
+ return -EBUSY;
+ return vb2_ext_dqbuf(vdev->queue, p, file->f_flags & O_NONBLOCK);
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_dqbuf);
+
int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
{
struct video_device *vdev = video_devdata(file);
@@ -1015,6 +1112,17 @@ int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p)
}
EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf);
+int vb2_ioctl_ext_expbuf(struct file *file, void *priv,
+ struct v4l2_ext_exportbuffer *p)
+{
+ struct video_device *vdev = video_devdata(file);
+
+ if (vb2_queue_is_busy(vdev, file))
+ return -EBUSY;
+ return vb2_ext_expbuf(vdev->queue, p);
+}
+EXPORT_SYMBOL_GPL(vb2_ioctl_ext_expbuf);
+
/* v4l2_file_operations helpers */
int vb2_fop_mmap(struct file *file, struct vm_area_struct *vma)
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 910f3d469005..5868b3807f13 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -151,6 +151,8 @@ struct vb2_mem_ops {
* @mem_priv: private data with this plane.
* @dbuf: dma_buf - shared buffer object.
* @dbuf_mapped: flag to show whether dbuf is mapped or not
+ * @dbuf_offset: offset where the plane starts. Usually 0, unless the buffer
+ * is shared by all planes of a multi-planar format.
* @bytesused: number of bytes occupied by data in the plane (payload).
* @length: size of this plane (NOT the payload) in bytes.
* @min_length: minimum required size of this plane (NOT the payload) in bytes.
@@ -174,6 +176,7 @@ struct vb2_plane {
void *mem_priv;
struct dma_buf *dbuf;
unsigned int dbuf_mapped;
+ unsigned int dbuf_offset;
unsigned int bytesused;
unsigned int length;
unsigned int min_length;
@@ -441,7 +444,8 @@ struct vb2_ops {
* struct vb2_buffer.
* For V4L2 this is a &struct vb2_v4l2_buffer.
* @fill_user_buffer: given a &vb2_buffer fill in the userspace structure.
- * For V4L2 this is a &struct v4l2_buffer.
+ * For V4L2 this is a &struct v4l2_buffer or
+ * &struct v4l2_ext_buffer.
* @fill_vb2_buffer: given a userspace structure, fill in the &vb2_buffer.
* If the userspace structure is invalid, then this op
* will return an error.
diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
index 8a10889dc2fd..99eff4639dc5 100644
--- a/include/media/videobuf2-v4l2.h
+++ b/include/media/videobuf2-v4l2.h
@@ -36,7 +36,7 @@
* @planes: plane information (userptr/fd, length, bytesused, data_offset).
*
* Should contain enough information to be able to cover all the fields
- * of &struct v4l2_buffer at ``videodev2.h``.
+ * of &struct v4l2_buffer and &struct v4l2_ext_buffer at ``videodev2.h``.
*/
struct vb2_v4l2_buffer {
struct vb2_buffer vb2_buf;
@@ -72,6 +72,7 @@ int vb2_find_timestamp(const struct vb2_queue *q, u64 timestamp,
unsigned int start_idx);
int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b);
+int vb2_ext_querybuf(struct vb2_queue *q, struct v4l2_ext_buffer *b);
/**
* vb2_reqbufs() - Wrapper for vb2_core_reqbufs() that also verifies
@@ -92,6 +93,8 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
* &v4l2_ioctl_ops->vidioc_create_bufs handler in driver
*/
int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
+int vb2_ext_create_bufs(struct vb2_queue *q,
+ struct v4l2_ext_create_buffers *create);
/**
* vb2_prepare_buf() - Pass ownership of a buffer from userspace to the kernel
@@ -117,6 +120,8 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
*/
int vb2_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
struct v4l2_buffer *b);
+int vb2_ext_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_ext_buffer *b);
/**
* vb2_qbuf() - Queue a buffer from userspace
@@ -143,6 +148,8 @@ int vb2_prepare_buf(struct vb2_queue *q, struct media_device *mdev,
*/
int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
struct v4l2_buffer *b);
+int vb2_ext_qbuf(struct vb2_queue *q, struct media_device *mdev,
+ struct v4l2_ext_buffer *b);
/**
* vb2_expbuf() - Export a buffer as a file descriptor
@@ -154,6 +161,7 @@ int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
* from &v4l2_ioctl_ops->vidioc_expbuf handler in driver.
*/
int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb);
+int vb2_ext_expbuf(struct vb2_queue *q, struct v4l2_ext_exportbuffer *eb);
/**
* vb2_dqbuf() - Dequeue a buffer to the userspace
@@ -180,6 +188,8 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb);
* from &v4l2_ioctl_ops->vidioc_dqbuf handler in driver.
*/
int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
+int vb2_ext_dqbuf(struct vb2_queue *q, struct v4l2_ext_buffer *b,
+ bool nonblocking);
/**
* vb2_streamon - start streaming
@@ -276,15 +286,27 @@ int vb2_ioctl_reqbufs(struct file *file, void *priv,
struct v4l2_requestbuffers *p);
int vb2_ioctl_create_bufs(struct file *file, void *priv,
struct v4l2_create_buffers *p);
+int vb2_ioctl_ext_create_bufs(struct file *file, void *priv,
+ struct v4l2_ext_create_buffers *p);
int vb2_ioctl_prepare_buf(struct file *file, void *priv,
struct v4l2_buffer *p);
+int vb2_ioctl_ext_prepare_buf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p);
int vb2_ioctl_querybuf(struct file *file, void *priv, struct v4l2_buffer *p);
+int vb2_ioctl_ext_querybuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p);
int vb2_ioctl_qbuf(struct file *file, void *priv, struct v4l2_buffer *p);
+int vb2_ioctl_ext_qbuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p);
int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p);
+int vb2_ioctl_ext_dqbuf(struct file *file, void *priv,
+ struct v4l2_ext_buffer *p);
int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i);
int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i);
int vb2_ioctl_expbuf(struct file *file, void *priv,
- struct v4l2_exportbuffer *p);
+ struct v4l2_exportbuffer *p);
+int vb2_ioctl_ext_expbuf(struct file *file, void *priv,
+ struct v4l2_ext_exportbuffer *p);
/* struct v4l2_file_operations helpers */
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 5/7] media: mediabus: Add an helper to convert a ext_pix format to an mbus_fmt
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
` (3 preceding siblings ...)
2019-04-04 8:16 ` [RFC PATCH v2 4/7] media: videobuf2: Expose helpers to implement the _ext_fmt and _ext_buf hooks Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 6/7] media: vivid: Convert the capture and output drivers to EXT_FMT/EXT_BUF Boris Brezillon
` (2 subsequent siblings)
7 siblings, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
Just a new version of v4l2_fill_mbus_format() to deal with the new
v4l2_ext_pix_format struct.
This is needed to convert the VIMC driver to the EXT_FMT/EXT_BUF iocts.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- New patch
---
include/media/v4l2-mediabus.h | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 66cb746ceeb5..f1a228be3c24 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -185,4 +185,26 @@ v4l2_fill_mbus_format_mplane(struct v4l2_mbus_framefmt *mbus_fmt,
mbus_fmt->xfer_func = pix_mp_fmt->xfer_func;
}
+/**
+ * v4l2_fill_mbus_format_ext - Ancillary routine that fills a &struct
+ * v4l2_mbus_framefmt from a &struct v4l2_ext_pix_format.
+ *
+ * @mbus_fmt: pointer to &struct v4l2_mbus_framefmt to be filled
+ * @pix_fmt: pointer to &struct v4l2_ext_pix_format to be used as model
+ * @code: data format code (from &enum v4l2_mbus_pixelcode)
+ */
+static inline void
+v4l2_fill_mbus_format_ext(struct v4l2_mbus_framefmt *mbus_fmt,
+ const struct v4l2_ext_pix_format *pix_fmt, u32 code)
+{
+ mbus_fmt->width = pix_fmt->width;
+ mbus_fmt->height = pix_fmt->height;
+ mbus_fmt->field = pix_fmt->field;
+ mbus_fmt->colorspace = pix_fmt->colorspace;
+ mbus_fmt->ycbcr_enc = pix_fmt->ycbcr_enc;
+ mbus_fmt->quantization = pix_fmt->quantization;
+ mbus_fmt->xfer_func = pix_fmt->xfer_func;
+ mbus_fmt->code = code;
+}
+
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 6/7] media: vivid: Convert the capture and output drivers to EXT_FMT/EXT_BUF
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
` (4 preceding siblings ...)
2019-04-04 8:16 ` [RFC PATCH v2 5/7] media: mediabus: Add an helper to convert a ext_pix format to an mbus_fmt Boris Brezillon
@ 2019-04-04 8:16 ` Boris Brezillon
2019-04-04 8:17 ` [RFC PATCH v2 7/7] media: vimc: Implement the ext_fmt and ext_buf hooks Boris Brezillon
2019-09-23 11:41 ` [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Hans Verkuil
7 siblings, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:16 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
This should simplify things a bit as we now have a single
implementation instead of the MPLANE and !MPLANE versions.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- New patch
---
drivers/media/platform/vivid/vivid-core.c | 30 ++-
drivers/media/platform/vivid/vivid-vid-cap.c | 171 +++++-----------
drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
drivers/media/platform/vivid/vivid-vid-out.c | 195 +++++++------------
drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
5 files changed, 142 insertions(+), 284 deletions(-)
diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 345adde47789..d9ef6a6878e2 100644
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -501,20 +501,14 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,
.vidioc_enum_fmt_vid_cap = vivid_enum_fmt_vid,
- .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
- .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
- .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
- .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_vid_cap_mplane,
- .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap_mplane,
- .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_vid_cap_mplane,
+ .vidioc_g_ext_fmt_vid_cap = vivid_g_fmt_vid_cap,
+ .vidioc_try_ext_fmt_vid_cap = vivid_try_fmt_vid_cap,
+ .vidioc_s_ext_fmt_vid_cap = vivid_s_fmt_vid_cap,
.vidioc_enum_fmt_vid_out = vivid_enum_fmt_vid,
- .vidioc_g_fmt_vid_out = vidioc_g_fmt_vid_out,
- .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
- .vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
- .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_vid_out_mplane,
- .vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_vid_out_mplane,
- .vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_vid_out_mplane,
+ .vidioc_g_ext_fmt_vid_out = vivid_g_fmt_vid_out,
+ .vidioc_try_ext_fmt_vid_out = vivid_try_fmt_vid_out,
+ .vidioc_s_ext_fmt_vid_out = vivid_s_fmt_vid_out,
.vidioc_g_selection = vidioc_g_selection,
.vidioc_s_selection = vidioc_s_selection,
@@ -559,12 +553,12 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = {
.vidioc_s_fbuf = vidioc_s_fbuf,
.vidioc_reqbufs = vb2_ioctl_reqbufs,
- .vidioc_create_bufs = vb2_ioctl_create_bufs,
- .vidioc_prepare_buf = vb2_ioctl_prepare_buf,
- .vidioc_querybuf = vb2_ioctl_querybuf,
- .vidioc_qbuf = vb2_ioctl_qbuf,
- .vidioc_dqbuf = vb2_ioctl_dqbuf,
- .vidioc_expbuf = vb2_ioctl_expbuf,
+ .vidioc_ext_create_bufs = vb2_ioctl_ext_create_bufs,
+ .vidioc_ext_prepare_buf = vb2_ioctl_ext_prepare_buf,
+ .vidioc_ext_querybuf = vb2_ioctl_ext_querybuf,
+ .vidioc_ext_qbuf = vb2_ioctl_ext_qbuf,
+ .vidioc_ext_dqbuf = vb2_ioctl_ext_dqbuf,
+ .vidioc_ext_expbuf = vb2_ioctl_ext_expbuf,
.vidioc_streamon = vb2_ioctl_streamon,
.vidioc_streamoff = vb2_ioctl_streamoff,
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 52eeda624d7e..ed4fc8c496d6 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -527,28 +527,27 @@ static unsigned vivid_quantization_cap(struct vivid_dev *dev)
}
int vivid_g_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
struct vivid_dev *dev = video_drvdata(file);
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
unsigned p;
- mp->width = dev->fmt_cap_rect.width;
- mp->height = dev->fmt_cap_rect.height;
- mp->field = dev->field_cap;
- mp->pixelformat = dev->fmt_cap->fourcc;
- mp->colorspace = vivid_colorspace_cap(dev);
- mp->xfer_func = vivid_xfer_func_cap(dev);
+ f->width = dev->fmt_cap_rect.width;
+ f->height = dev->fmt_cap_rect.height;
+ f->field = dev->field_cap;
+ f->pixelformat = dev->fmt_cap->fourcc;
+ f->colorspace = vivid_colorspace_cap(dev);
+ f->xfer_func = vivid_xfer_func_cap(dev);
if (dev->fmt_cap->color_enc == TGP_COLOR_ENC_HSV)
- mp->hsv_enc = vivid_hsv_enc_cap(dev);
+ f->hsv_enc = vivid_hsv_enc_cap(dev);
else
- mp->ycbcr_enc = vivid_ycbcr_enc_cap(dev);
- mp->quantization = vivid_quantization_cap(dev);
- mp->num_planes = dev->fmt_cap->buffers;
- for (p = 0; p < mp->num_planes; p++) {
- mp->plane_fmt[p].bytesperline = tpg_g_bytesperline(&dev->tpg, p);
- mp->plane_fmt[p].sizeimage =
- (tpg_g_line_width(&dev->tpg, p) * mp->height) /
+ f->ycbcr_enc = vivid_ycbcr_enc_cap(dev);
+ f->quantization = vivid_quantization_cap(dev);
+ f->num_planes = dev->fmt_cap->buffers;
+ for (p = 0; p < f->num_planes; p++) {
+ f->plane_fmt[p].bytesperline = tpg_g_bytesperline(&dev->tpg, p);
+ f->plane_fmt[p].sizeimage =
+ (tpg_g_line_width(&dev->tpg, p) * f->height) /
dev->fmt_cap->vdownsampling[p] +
dev->fmt_cap->data_offset[p];
}
@@ -556,31 +555,30 @@ int vivid_g_fmt_vid_cap(struct file *file, void *priv,
}
int vivid_try_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
- struct v4l2_plane_pix_format *pfmt = mp->plane_fmt;
struct vivid_dev *dev = video_drvdata(file);
+ struct v4l2_plane_ext_pix_format *pfmt = f->plane_fmt;
const struct vivid_fmt *fmt;
unsigned bytesperline, max_bpl;
unsigned factor = 1;
unsigned w, h;
unsigned p;
- fmt = vivid_get_format(dev, mp->pixelformat);
+ fmt = vivid_get_format(dev, f->pixelformat);
if (!fmt) {
dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
- mp->pixelformat);
- mp->pixelformat = V4L2_PIX_FMT_YUYV;
- fmt = vivid_get_format(dev, mp->pixelformat);
+ f->pixelformat);
+ f->pixelformat = V4L2_PIX_FMT_YUYV;
+ fmt = vivid_get_format(dev, f->pixelformat);
}
- mp->field = vivid_field_cap(dev, mp->field);
+ f->field = vivid_field_cap(dev, f->field);
if (vivid_is_webcam(dev)) {
const struct v4l2_frmsize_discrete *sz =
v4l2_find_nearest_size(webcam_sizes,
VIVID_WEBCAM_SIZES, width,
- height, mp->width, mp->height);
+ height, f->width, f->height);
w = sz->width;
h = sz->height;
@@ -591,14 +589,14 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
w = dev->src_rect.width;
h = dev->src_rect.height;
}
- if (V4L2_FIELD_HAS_T_OR_B(mp->field))
+ if (V4L2_FIELD_HAS_T_OR_B(f->field))
factor = 2;
if (vivid_is_webcam(dev) ||
(!dev->has_scaler_cap && !dev->has_crop_cap && !dev->has_compose_cap)) {
- mp->width = w;
- mp->height = h / factor;
+ f->width = w;
+ f->height = h / factor;
} else {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height * factor };
+ struct v4l2_rect r = { 0, 0, f->width, f->height * factor };
v4l2_rect_set_min_size(&r, &vivid_min_rect);
v4l2_rect_set_max_size(&r, &vivid_max_rect);
@@ -611,16 +609,16 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
} else if (!dev->has_scaler_cap && !dev->has_crop_cap) {
v4l2_rect_set_min_size(&r, &dev->src_rect);
}
- mp->width = r.width;
- mp->height = r.height / factor;
+ f->width = r.width;
+ f->height = r.height / factor;
}
/* This driver supports custom bytesperline values */
- mp->num_planes = fmt->buffers;
+ f->num_planes = fmt->buffers;
for (p = 0; p < fmt->buffers; p++) {
/* Calculate the minimum supported bytesperline value */
- bytesperline = (mp->width * fmt->bit_depth[p]) >> 3;
+ bytesperline = (f->width * fmt->bit_depth[p]) >> 3;
/* Calculate the maximum supported bytesperline value */
max_bpl = (MAX_ZOOM * MAX_WIDTH * fmt->bit_depth[p]) >> 3;
@@ -629,31 +627,27 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
if (pfmt[p].bytesperline < bytesperline)
pfmt[p].bytesperline = bytesperline;
- pfmt[p].sizeimage = (pfmt[p].bytesperline * mp->height) /
+ pfmt[p].sizeimage = (pfmt[p].bytesperline * f->height) /
fmt->vdownsampling[p] + fmt->data_offset[p];
-
- memset(pfmt[p].reserved, 0, sizeof(pfmt[p].reserved));
}
for (p = fmt->buffers; p < fmt->planes; p++)
- pfmt[0].sizeimage += (pfmt[0].bytesperline * mp->height *
+ pfmt[0].sizeimage += (pfmt[0].bytesperline * f->height *
(fmt->bit_depth[p] / fmt->vdownsampling[p])) /
(fmt->bit_depth[0] / fmt->vdownsampling[0]);
- mp->colorspace = vivid_colorspace_cap(dev);
+ f->colorspace = vivid_colorspace_cap(dev);
if (fmt->color_enc == TGP_COLOR_ENC_HSV)
- mp->hsv_enc = vivid_hsv_enc_cap(dev);
+ f->hsv_enc = vivid_hsv_enc_cap(dev);
else
- mp->ycbcr_enc = vivid_ycbcr_enc_cap(dev);
- mp->xfer_func = vivid_xfer_func_cap(dev);
- mp->quantization = vivid_quantization_cap(dev);
- memset(mp->reserved, 0, sizeof(mp->reserved));
+ f->ycbcr_enc = vivid_ycbcr_enc_cap(dev);
+ f->xfer_func = vivid_xfer_func_cap(dev);
+ f->quantization = vivid_quantization_cap(dev);
return 0;
}
int vivid_s_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
struct vivid_dev *dev = video_drvdata(file);
struct v4l2_rect *crop = &dev->crop_cap;
struct v4l2_rect *compose = &dev->compose_cap;
@@ -671,20 +665,21 @@ int vivid_s_fmt_vid_cap(struct file *file, void *priv,
return -EBUSY;
}
- if (dev->overlay_cap_owner && dev->fb_cap.fmt.pixelformat != mp->pixelformat) {
+ if (dev->overlay_cap_owner &&
+ dev->fb_cap.fmt.pixelformat != f->pixelformat) {
dprintk(dev, 1, "overlay is active, can't change pixelformat\n");
return -EBUSY;
}
- dev->fmt_cap = vivid_get_format(dev, mp->pixelformat);
- if (V4L2_FIELD_HAS_T_OR_B(mp->field))
+ dev->fmt_cap = vivid_get_format(dev, f->pixelformat);
+ if (V4L2_FIELD_HAS_T_OR_B(f->field))
factor = 2;
/* Note: the webcam input doesn't support scaling, cropping or composing */
if (!vivid_is_webcam(dev) &&
(dev->has_scaler_cap || dev->has_crop_cap || dev->has_compose_cap)) {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height };
+ struct v4l2_rect r = { 0, 0, f->width, f->height };
if (dev->has_scaler_cap) {
if (dev->has_compose_cap)
@@ -745,99 +740,39 @@ int vivid_s_fmt_vid_cap(struct file *file, void *priv,
} else if (vivid_is_webcam(dev)) {
/* Guaranteed to be a match */
for (i = 0; i < ARRAY_SIZE(webcam_sizes); i++)
- if (webcam_sizes[i].width == mp->width &&
- webcam_sizes[i].height == mp->height)
+ if (webcam_sizes[i].width == f->width &&
+ webcam_sizes[i].height == f->height)
break;
dev->webcam_size_idx = i;
if (dev->webcam_ival_idx >= 2 * (VIVID_WEBCAM_SIZES - i))
dev->webcam_ival_idx = 2 * (VIVID_WEBCAM_SIZES - i) - 1;
vivid_update_format_cap(dev, false);
} else {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height };
+ struct v4l2_rect r = { 0, 0, f->width, f->height };
v4l2_rect_set_size_to(compose, &r);
r.height *= factor;
v4l2_rect_set_size_to(crop, &r);
}
- dev->fmt_cap_rect.width = mp->width;
- dev->fmt_cap_rect.height = mp->height;
- tpg_s_buf_height(&dev->tpg, mp->height);
+ dev->fmt_cap_rect.width = f->width;
+ dev->fmt_cap_rect.height = f->height;
+ tpg_s_buf_height(&dev->tpg, f->height);
tpg_s_fourcc(&dev->tpg, dev->fmt_cap->fourcc);
for (p = 0; p < tpg_g_buffers(&dev->tpg); p++)
- tpg_s_bytesperline(&dev->tpg, p, mp->plane_fmt[p].bytesperline);
- dev->field_cap = mp->field;
+ tpg_s_bytesperline(&dev->tpg, p, f->plane_fmt[p].bytesperline);
+ dev->field_cap = f->field;
if (dev->field_cap == V4L2_FIELD_ALTERNATE)
tpg_s_field(&dev->tpg, V4L2_FIELD_TOP, true);
else
tpg_s_field(&dev->tpg, dev->field_cap, false);
tpg_s_crop_compose(&dev->tpg, &dev->crop_cap, &dev->compose_cap);
if (vivid_is_sdtv_cap(dev))
- dev->tv_field_cap = mp->field;
+ dev->tv_field_cap = f->field;
tpg_update_mv_step(&dev->tpg);
return 0;
}
-int vidioc_g_fmt_vid_cap_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_g_fmt_vid_cap(file, priv, f);
-}
-
-int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_try_fmt_vid_cap(file, priv, f);
-}
-
-int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_s_fmt_vid_cap(file, priv, f);
-}
-
-int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_g_fmt_vid_cap);
-}
-
-int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_try_fmt_vid_cap);
-}
-
-int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_s_fmt_vid_cap);
-}
-
int vivid_vid_cap_g_selection(struct file *file, void *priv,
struct v4l2_selection *sel)
{
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.h b/drivers/media/platform/vivid/vivid-vid-cap.h
index 1e422a59eeab..7c9fc5c787b5 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.h
+++ b/drivers/media/platform/vivid/vivid-vid-cap.h
@@ -17,15 +17,12 @@ extern const char * const vivid_ctrl_standard_strings[];
extern const struct vb2_ops vivid_vid_cap_qops;
-int vivid_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
-int vivid_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
-int vivid_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_g_fmt_vid_cap_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_s_fmt_vid_cap_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f);
+int vivid_g_fmt_vid_cap(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
+int vivid_try_fmt_vid_cap(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
+int vivid_s_fmt_vid_cap(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
int vivid_vid_cap_g_selection(struct file *file, void *priv, struct v4l2_selection *sel);
int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection *s);
int vivid_vid_cap_g_pixelaspect(struct file *file, void *priv, int type, struct v4l2_fract *f);
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index e61b91b414f9..fe9a7c32507d 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -318,59 +318,57 @@ static enum tpg_pixel_aspect vivid_get_pixel_aspect(const struct vivid_dev *dev)
}
int vivid_g_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
struct vivid_dev *dev = video_drvdata(file);
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
const struct vivid_fmt *fmt = dev->fmt_out;
unsigned p;
- mp->width = dev->fmt_out_rect.width;
- mp->height = dev->fmt_out_rect.height;
- mp->field = dev->field_out;
- mp->pixelformat = fmt->fourcc;
- mp->colorspace = dev->colorspace_out;
- mp->xfer_func = dev->xfer_func_out;
- mp->ycbcr_enc = dev->ycbcr_enc_out;
- mp->quantization = dev->quantization_out;
- mp->num_planes = fmt->buffers;
- for (p = 0; p < mp->num_planes; p++) {
- mp->plane_fmt[p].bytesperline = dev->bytesperline_out[p];
- mp->plane_fmt[p].sizeimage =
- mp->plane_fmt[p].bytesperline * mp->height +
+ f->width = dev->fmt_out_rect.width;
+ f->height = dev->fmt_out_rect.height;
+ f->field = dev->field_out;
+ f->pixelformat = fmt->fourcc;
+ f->colorspace = dev->colorspace_out;
+ f->xfer_func = dev->xfer_func_out;
+ f->ycbcr_enc = dev->ycbcr_enc_out;
+ f->quantization = dev->quantization_out;
+ f->num_planes = fmt->buffers;
+ for (p = 0; p < f->num_planes; p++) {
+ f->plane_fmt[p].bytesperline = dev->bytesperline_out[p];
+ f->plane_fmt[p].sizeimage =
+ f->plane_fmt[p].bytesperline * f->height +
fmt->data_offset[p];
}
for (p = fmt->buffers; p < fmt->planes; p++) {
unsigned stride = dev->bytesperline_out[p];
- mp->plane_fmt[0].sizeimage +=
- (stride * mp->height) / fmt->vdownsampling[p];
+ f->plane_fmt[0].sizeimage +=
+ (stride * f->height) / fmt->vdownsampling[p];
}
return 0;
}
int vivid_try_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
struct vivid_dev *dev = video_drvdata(file);
+ struct v4l2_plane_ext_pix_format *pfmt = f->plane_fmt;
struct v4l2_bt_timings *bt = &dev->dv_timings_out.bt;
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
- struct v4l2_plane_pix_format *pfmt = mp->plane_fmt;
const struct vivid_fmt *fmt;
unsigned bytesperline, max_bpl;
unsigned factor = 1;
unsigned w, h;
unsigned p;
- fmt = vivid_get_format(dev, mp->pixelformat);
+ fmt = vivid_get_format(dev, f->pixelformat);
if (!fmt) {
dprintk(dev, 1, "Fourcc format (0x%08x) unknown.\n",
- mp->pixelformat);
- mp->pixelformat = V4L2_PIX_FMT_YUYV;
- fmt = vivid_get_format(dev, mp->pixelformat);
+ f->pixelformat);
+ f->pixelformat = V4L2_PIX_FMT_YUYV;
+ fmt = vivid_get_format(dev, f->pixelformat);
}
- mp->field = vivid_field_out(dev, mp->field);
+ f->field = vivid_field_out(dev, f->field);
if (vivid_is_svid_out(dev)) {
w = 720;
h = (dev->std_out & V4L2_STD_525_60) ? 480 : 576;
@@ -378,13 +376,13 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
w = dev->sink_rect.width;
h = dev->sink_rect.height;
}
- if (V4L2_FIELD_HAS_T_OR_B(mp->field))
+ if (V4L2_FIELD_HAS_T_OR_B(f->field))
factor = 2;
if (!dev->has_scaler_out && !dev->has_crop_out && !dev->has_compose_out) {
- mp->width = w;
- mp->height = h / factor;
+ f->width = w;
+ f->height = h / factor;
} else {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height * factor };
+ struct v4l2_rect r = { 0, 0, f->width, f->height * factor };
v4l2_rect_set_min_size(&r, &vivid_min_rect);
v4l2_rect_set_max_size(&r, &vivid_max_rect);
@@ -397,16 +395,16 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
} else if (!dev->has_scaler_out && !dev->has_compose_out) {
v4l2_rect_set_min_size(&r, &dev->sink_rect);
}
- mp->width = r.width;
- mp->height = r.height / factor;
+ f->width = r.width;
+ f->height = r.height / factor;
}
/* This driver supports custom bytesperline values */
- mp->num_planes = fmt->buffers;
+ f->num_planes = fmt->buffers;
for (p = 0; p < fmt->buffers; p++) {
/* Calculate the minimum supported bytesperline value */
- bytesperline = (mp->width * fmt->bit_depth[p]) >> 3;
+ bytesperline = (f->width * fmt->bit_depth[p]) >> 3;
/* Calculate the maximum supported bytesperline value */
max_bpl = (MAX_ZOOM * MAX_WIDTH * fmt->bit_depth[p]) >> 3;
@@ -415,42 +413,39 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
if (pfmt[p].bytesperline < bytesperline)
pfmt[p].bytesperline = bytesperline;
- pfmt[p].sizeimage = (pfmt[p].bytesperline * mp->height) /
+ pfmt[p].sizeimage = (pfmt[p].bytesperline * f->height) /
fmt->vdownsampling[p] + fmt->data_offset[p];
- memset(pfmt[p].reserved, 0, sizeof(pfmt[p].reserved));
}
for (p = fmt->buffers; p < fmt->planes; p++)
- pfmt[0].sizeimage += (pfmt[0].bytesperline * mp->height *
+ pfmt[0].sizeimage += (pfmt[0].bytesperline * f->height *
(fmt->bit_depth[p] / fmt->vdownsampling[p])) /
(fmt->bit_depth[0] / fmt->vdownsampling[0]);
- mp->xfer_func = V4L2_XFER_FUNC_DEFAULT;
- mp->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
- mp->quantization = V4L2_QUANTIZATION_DEFAULT;
+ f->xfer_func = V4L2_XFER_FUNC_DEFAULT;
+ f->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
+ f->quantization = V4L2_QUANTIZATION_DEFAULT;
if (vivid_is_svid_out(dev)) {
- mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
+ f->colorspace = V4L2_COLORSPACE_SMPTE170M;
} else if (dev->dvi_d_out || !(bt->flags & V4L2_DV_FL_IS_CE_VIDEO)) {
- mp->colorspace = V4L2_COLORSPACE_SRGB;
+ f->colorspace = V4L2_COLORSPACE_SRGB;
if (dev->dvi_d_out)
- mp->quantization = V4L2_QUANTIZATION_LIM_RANGE;
+ f->quantization = V4L2_QUANTIZATION_LIM_RANGE;
} else if (bt->width == 720 && bt->height <= 576) {
- mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
- } else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M &&
- mp->colorspace != V4L2_COLORSPACE_REC709 &&
- mp->colorspace != V4L2_COLORSPACE_OPRGB &&
- mp->colorspace != V4L2_COLORSPACE_BT2020 &&
- mp->colorspace != V4L2_COLORSPACE_SRGB) {
- mp->colorspace = V4L2_COLORSPACE_REC709;
+ f->colorspace = V4L2_COLORSPACE_SMPTE170M;
+ } else if (f->colorspace != V4L2_COLORSPACE_SMPTE170M &&
+ f->colorspace != V4L2_COLORSPACE_REC709 &&
+ f->colorspace != V4L2_COLORSPACE_OPRGB &&
+ f->colorspace != V4L2_COLORSPACE_BT2020 &&
+ f->colorspace != V4L2_COLORSPACE_SRGB) {
+ f->colorspace = V4L2_COLORSPACE_REC709;
}
- memset(mp->reserved, 0, sizeof(mp->reserved));
return 0;
}
int vivid_s_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
- struct v4l2_pix_format_mplane *mp = &f->fmt.pix_mp;
struct vivid_dev *dev = video_drvdata(file);
struct v4l2_rect *crop = &dev->crop_out;
struct v4l2_rect *compose = &dev->compose_out;
@@ -464,10 +459,10 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
if (vb2_is_busy(q) &&
(vivid_is_svid_out(dev) ||
- mp->width != dev->fmt_out_rect.width ||
- mp->height != dev->fmt_out_rect.height ||
- mp->pixelformat != dev->fmt_out->fourcc ||
- mp->field != dev->field_out)) {
+ f->width != dev->fmt_out_rect.width ||
+ f->height != dev->fmt_out_rect.height ||
+ f->pixelformat != dev->fmt_out->fourcc ||
+ f->field != dev->field_out)) {
dprintk(dev, 1, "%s device busy\n", __func__);
return -EBUSY;
}
@@ -480,12 +475,12 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
if (vb2_is_busy(q))
goto set_colorspace;
- dev->fmt_out = vivid_get_format(dev, mp->pixelformat);
- if (V4L2_FIELD_HAS_T_OR_B(mp->field))
+ dev->fmt_out = vivid_get_format(dev, f->pixelformat);
+ if (V4L2_FIELD_HAS_T_OR_B(f->field))
factor = 2;
if (dev->has_scaler_out || dev->has_crop_out || dev->has_compose_out) {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height };
+ struct v4l2_rect r = { 0, 0, f->width, f->height };
if (dev->has_scaler_out) {
if (dev->has_crop_out)
@@ -544,30 +539,30 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
crop->height /= factor;
}
} else {
- struct v4l2_rect r = { 0, 0, mp->width, mp->height };
+ struct v4l2_rect r = { 0, 0, f->width, f->height };
v4l2_rect_set_size_to(crop, &r);
r.height /= factor;
v4l2_rect_set_size_to(compose, &r);
}
- dev->fmt_out_rect.width = mp->width;
- dev->fmt_out_rect.height = mp->height;
- for (p = 0; p < mp->num_planes; p++)
- dev->bytesperline_out[p] = mp->plane_fmt[p].bytesperline;
+ dev->fmt_out_rect.width = f->width;
+ dev->fmt_out_rect.height = f->height;
+ for (p = 0; p < f->num_planes; p++)
+ dev->bytesperline_out[p] = f->plane_fmt[p].bytesperline;
for (p = dev->fmt_out->buffers; p < dev->fmt_out->planes; p++)
dev->bytesperline_out[p] =
(dev->bytesperline_out[0] * dev->fmt_out->bit_depth[p]) /
dev->fmt_out->bit_depth[0];
- dev->field_out = mp->field;
+ dev->field_out = f->field;
if (vivid_is_svid_out(dev))
- dev->tv_field_out = mp->field;
+ dev->tv_field_out = f->field;
set_colorspace:
- dev->colorspace_out = mp->colorspace;
- dev->xfer_func_out = mp->xfer_func;
- dev->ycbcr_enc_out = mp->ycbcr_enc;
- dev->quantization_out = mp->quantization;
+ dev->colorspace_out = f->colorspace;
+ dev->xfer_func_out = f->xfer_func;
+ dev->ycbcr_enc_out = f->ycbcr_enc;
+ dev->quantization_out = f->quantization;
if (dev->loop_video) {
vivid_send_source_change(dev, SVID);
vivid_send_source_change(dev, HDMI);
@@ -575,66 +570,6 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
return 0;
}
-int vidioc_g_fmt_vid_out_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_g_fmt_vid_out(file, priv, f);
-}
-
-int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_try_fmt_vid_out(file, priv, f);
-}
-
-int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (!dev->multiplanar)
- return -ENOTTY;
- return vivid_s_fmt_vid_out(file, priv, f);
-}
-
-int vidioc_g_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_g_fmt_vid_out);
-}
-
-int vidioc_try_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_try_fmt_vid_out);
-}
-
-int vidioc_s_fmt_vid_out(struct file *file, void *priv,
- struct v4l2_format *f)
-{
- struct vivid_dev *dev = video_drvdata(file);
-
- if (dev->multiplanar)
- return -ENOTTY;
- return fmt_sp2mp_func(file, priv, f, vivid_s_fmt_vid_out);
-}
-
int vivid_vid_out_g_selection(struct file *file, void *priv,
struct v4l2_selection *sel)
{
diff --git a/drivers/media/platform/vivid/vivid-vid-out.h b/drivers/media/platform/vivid/vivid-vid-out.h
index 8d56314f4ea1..b84dc578af36 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.h
+++ b/drivers/media/platform/vivid/vivid-vid-out.h
@@ -12,15 +12,12 @@ extern const struct vb2_ops vivid_vid_out_qops;
void vivid_update_format_out(struct vivid_dev *dev);
-int vivid_g_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
-int vivid_try_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
-int vivid_s_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_g_fmt_vid_out_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_s_fmt_vid_out_mplane(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_g_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_try_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
-int vidioc_s_fmt_vid_out(struct file *file, void *priv, struct v4l2_format *f);
+int vivid_g_fmt_vid_out(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
+int vivid_try_fmt_vid_out(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
+int vivid_s_fmt_vid_out(struct file *file, void *priv,
+ struct v4l2_ext_pix_format *f);
int vivid_vid_out_g_selection(struct file *file, void *priv, struct v4l2_selection *sel);
int vivid_vid_out_s_selection(struct file *file, void *fh, struct v4l2_selection *s);
int vivid_vid_out_g_pixelaspect(struct file *file, void *priv, int type, struct v4l2_fract *f);
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [RFC PATCH v2 7/7] media: vimc: Implement the ext_fmt and ext_buf hooks
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
` (5 preceding siblings ...)
2019-04-04 8:16 ` [RFC PATCH v2 6/7] media: vivid: Convert the capture and output drivers to EXT_FMT/EXT_BUF Boris Brezillon
@ 2019-04-04 8:17 ` Boris Brezillon
2019-09-23 11:41 ` [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Hans Verkuil
7 siblings, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-04 8:17 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
Convert the driver to the _ext_fmt and _ext_buf API.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Changes in v2:
- New patch
---
drivers/media/platform/vimc/vimc-capture.c | 65 +++++++++++-----------
drivers/media/platform/vimc/vimc-common.c | 4 +-
drivers/media/platform/vimc/vimc-common.h | 2 +-
drivers/media/platform/vimc/vimc-core.c | 10 +---
4 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index ea869631a3f6..6dc1ea2d6b97 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -32,7 +32,7 @@ struct vimc_cap_device {
struct vimc_ent_device ved;
struct video_device vdev;
struct device *dev;
- struct v4l2_pix_format format;
+ struct v4l2_ext_pix_format format;
struct vb2_queue queue;
struct list_head buf_list;
/*
@@ -48,12 +48,13 @@ struct vimc_cap_device {
struct vimc_stream stream;
};
-static const struct v4l2_pix_format fmt_default = {
+static const struct v4l2_ext_pix_format fmt_default = {
.width = 640,
.height = 480,
.pixelformat = V4L2_PIX_FMT_RGB24,
.field = V4L2_FIELD_NONE,
.colorspace = V4L2_COLORSPACE_DEFAULT,
+ .num_planes = 1,
};
struct vimc_cap_buffer {
@@ -79,7 +80,7 @@ static int vimc_cap_querycap(struct file *file, void *priv,
}
static void vimc_cap_get_format(struct vimc_ent_device *ved,
- struct v4l2_pix_format *fmt)
+ struct v4l2_ext_pix_format *fmt)
{
struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device,
ved);
@@ -88,19 +89,18 @@ static void vimc_cap_get_format(struct vimc_ent_device *ved,
}
static int vimc_cap_g_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
struct vimc_cap_device *vcap = video_drvdata(file);
- f->fmt.pix = vcap->format;
+ *f = vcap->format;
return 0;
}
static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *format)
{
- struct v4l2_pix_format *format = &f->fmt.pix;
const struct vimc_pix_map *vpix;
format->width = clamp_t(u32, format->width, VIMC_FRAME_MIN_WIDTH,
@@ -115,8 +115,10 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,
vpix = vimc_pix_map_by_pixelformat(format->pixelformat);
}
/* TODO: Add support for custom bytesperline values */
- format->bytesperline = format->width * vpix->bpp;
- format->sizeimage = format->bytesperline * format->height;
+ format->num_planes = 1;
+ format->plane_fmt[0].bytesperline = format->width * vpix->bpp;
+ format->plane_fmt[0].sizeimage = format->plane_fmt[0].bytesperline *
+ format->height;
if (format->field == V4L2_FIELD_ANY)
format->field = fmt_default.field;
@@ -127,7 +129,7 @@ static int vimc_cap_try_fmt_vid_cap(struct file *file, void *priv,
}
static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,
- struct v4l2_format *f)
+ struct v4l2_ext_pix_format *f)
{
struct vimc_cap_device *vcap = video_drvdata(file);
@@ -146,12 +148,10 @@ static int vimc_cap_s_fmt_vid_cap(struct file *file, void *priv,
vcap->format.quantization, vcap->format.xfer_func,
vcap->format.ycbcr_enc,
/* new */
- f->fmt.pix.width, f->fmt.pix.height,
- f->fmt.pix.pixelformat, f->fmt.pix.colorspace,
- f->fmt.pix.quantization, f->fmt.pix.xfer_func,
- f->fmt.pix.ycbcr_enc);
+ f->width, f->height, f->pixelformat, f->colorspace,
+ f->quantization, f->xfer_func, f->ycbcr_enc);
- vcap->format = f->fmt.pix;
+ vcap->format = *f;
return 0;
}
@@ -206,19 +206,19 @@ static const struct v4l2_file_operations vimc_cap_fops = {
static const struct v4l2_ioctl_ops vimc_cap_ioctl_ops = {
.vidioc_querycap = vimc_cap_querycap,
- .vidioc_g_fmt_vid_cap = vimc_cap_g_fmt_vid_cap,
- .vidioc_s_fmt_vid_cap = vimc_cap_s_fmt_vid_cap,
- .vidioc_try_fmt_vid_cap = vimc_cap_try_fmt_vid_cap,
+ .vidioc_g_ext_fmt_vid_cap = vimc_cap_g_fmt_vid_cap,
+ .vidioc_s_ext_fmt_vid_cap = vimc_cap_s_fmt_vid_cap,
+ .vidioc_try_ext_fmt_vid_cap = vimc_cap_try_fmt_vid_cap,
.vidioc_enum_fmt_vid_cap = vimc_cap_enum_fmt_vid_cap,
.vidioc_enum_framesizes = vimc_cap_enum_framesizes,
.vidioc_reqbufs = vb2_ioctl_reqbufs,
- .vidioc_create_bufs = vb2_ioctl_create_bufs,
- .vidioc_prepare_buf = vb2_ioctl_prepare_buf,
- .vidioc_querybuf = vb2_ioctl_querybuf,
- .vidioc_qbuf = vb2_ioctl_qbuf,
- .vidioc_dqbuf = vb2_ioctl_dqbuf,
- .vidioc_expbuf = vb2_ioctl_expbuf,
+ .vidioc_ext_create_bufs = vb2_ioctl_ext_create_bufs,
+ .vidioc_ext_prepare_buf = vb2_ioctl_ext_prepare_buf,
+ .vidioc_ext_querybuf = vb2_ioctl_ext_querybuf,
+ .vidioc_ext_qbuf = vb2_ioctl_ext_qbuf,
+ .vidioc_ext_dqbuf = vb2_ioctl_ext_dqbuf,
+ .vidioc_ext_expbuf = vb2_ioctl_ext_expbuf,
.vidioc_streamon = vb2_ioctl_streamon,
.vidioc_streamoff = vb2_ioctl_streamoff,
};
@@ -299,10 +299,11 @@ static int vimc_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
struct vimc_cap_device *vcap = vb2_get_drv_priv(vq);
if (*nplanes)
- return sizes[0] < vcap->format.sizeimage ? -EINVAL : 0;
+ return sizes[0] < vcap->format.plane_fmt[0].sizeimage ?
+ -EINVAL : 0;
/* We don't support multiplanes for now */
*nplanes = 1;
- sizes[0] = vcap->format.sizeimage;
+ sizes[0] = vcap->format.plane_fmt[0].sizeimage;
return 0;
}
@@ -310,7 +311,7 @@ static int vimc_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
static int vimc_cap_buffer_prepare(struct vb2_buffer *vb)
{
struct vimc_cap_device *vcap = vb2_get_drv_priv(vb->vb2_queue);
- unsigned long size = vcap->format.sizeimage;
+ unsigned long size = vcap->format.plane_fmt[0].sizeimage;
if (vb2_plane_size(vb, 0) < size) {
dev_err(vcap->dev, "%s: buffer too small (%lu < %lu)\n",
@@ -382,11 +383,11 @@ static void *vimc_cap_process_frame(struct vimc_ent_device *ved,
vbuf = vb2_plane_vaddr(&vimc_buf->vb2.vb2_buf, 0);
- memcpy(vbuf, frame, vcap->format.sizeimage);
+ memcpy(vbuf, frame, vcap->format.plane_fmt[0].sizeimage);
/* Set it as ready */
vb2_set_plane_payload(&vimc_buf->vb2.vb2_buf, 0,
- vcap->format.sizeimage);
+ vcap->format.plane_fmt[0].sizeimage);
vb2_buffer_done(&vimc_buf->vb2.vb2_buf, VB2_BUF_STATE_DONE);
return NULL;
}
@@ -452,9 +453,9 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master,
/* Set default frame format */
vcap->format = fmt_default;
vpix = vimc_pix_map_by_pixelformat(vcap->format.pixelformat);
- vcap->format.bytesperline = vcap->format.width * vpix->bpp;
- vcap->format.sizeimage = vcap->format.bytesperline *
- vcap->format.height;
+ vcap->format.plane_fmt[0].bytesperline = vcap->format.width * vpix->bpp;
+ vcap->format.plane_fmt[0].sizeimage = vcap->format.plane_fmt[0].bytesperline *
+ vcap->format.height;
/* Fill the vimc_ent_device struct */
vcap->ved.ent = &vcap->vdev.entity;
diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c
index c1a74bb2df58..0d0e4679572c 100644
--- a/drivers/media/platform/vimc/vimc-common.c
+++ b/drivers/media/platform/vimc/vimc-common.c
@@ -278,14 +278,14 @@ static int vimc_get_mbus_format(struct media_pad *pad,
entity);
struct vimc_ent_device *ved = video_get_drvdata(vdev);
const struct vimc_pix_map *vpix;
- struct v4l2_pix_format vdev_fmt;
+ struct v4l2_ext_pix_format vdev_fmt;
if (!ved->vdev_get_format)
return -ENOIOCTLCMD;
ved->vdev_get_format(ved, &vdev_fmt);
vpix = vimc_pix_map_by_pixelformat(vdev_fmt.pixelformat);
- v4l2_fill_mbus_format(&fmt->format, &vdev_fmt, vpix->code);
+ v4l2_fill_mbus_format_ext(&fmt->format, &vdev_fmt, vpix->code);
} else {
return -EINVAL;
}
diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h
index 84539430b5e7..3c8b2b5eb16f 100644
--- a/drivers/media/platform/vimc/vimc-common.h
+++ b/drivers/media/platform/vimc/vimc-common.h
@@ -118,7 +118,7 @@ struct vimc_ent_device {
void * (*process_frame)(struct vimc_ent_device *ved,
const void *frame);
void (*vdev_get_format)(struct vimc_ent_device *ved,
- struct v4l2_pix_format *fmt);
+ struct v4l2_ext_pix_format *fmt);
};
/**
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index c231fce58b43..52bd84e3dc93 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -244,13 +244,7 @@ static void vimc_comp_unbind(struct device *master)
static int vimc_comp_compare(struct device *comp, void *data)
{
- const struct platform_device *pdev = to_platform_device(comp);
- const char *name = data;
-
- if (!pdev->dev.platform_data)
- return 0;
-
- return !strcmp(pdev->dev.platform_data, name);
+ return comp == data;
}
static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
@@ -280,7 +274,7 @@ static struct component_match *vimc_add_subdevs(struct vimc_device *vimc)
}
component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare,
- (void *)vimc->pipe_cfg->ents[i].name);
+ &vimc->subdevs[i]->dev);
}
return match;
--
2.20.1
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-04 8:16 ` [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Boris Brezillon
@ 2019-04-11 7:59 ` Hans Verkuil
2019-04-11 10:36 ` Boris Brezillon
0 siblings, 1 reply; 25+ messages in thread
From: Hans Verkuil @ 2019-04-11 7:59 UTC (permalink / raw)
To: Boris Brezillon, Mauro Carvalho Chehab, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
On 4/4/19 10:16 AM, Boris Brezillon wrote:
> Support for multiplanar and singleplanar formats is mutually exclusive,
> at least in practice. In our attempt to unify support for support for
> mplane and !mplane in v4l, let's get rid of the
> ->vidioc_enum_fmt_{vid,out}_cap_mplane() hooks and call
> ->vidioc_enum_fmt_{vid,out}_cap() instead.
This is a good idea. This can be done separately from the other patches in
this series and merged.
One comment...
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
> Changes in v2:
> - None
> ---
> drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
> drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 ++--
> .../media/platform/exynos4-is/fimc-capture.c | 2 +-
> .../platform/exynos4-is/fimc-isp-video.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-m2m.c | 4 ++--
> .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
> drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 ++--
> .../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++--
> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 ++--
> .../media/platform/qcom/camss/camss-video.c | 2 +-
> drivers/media/platform/qcom/venus/vdec.c | 4 ++--
> drivers/media/platform/qcom/venus/venc.c | 4 ++--
> drivers/media/platform/rcar_fdp1.c | 4 ++--
> drivers/media/platform/rcar_jpu.c | 4 ++--
> drivers/media/platform/renesas-ceu.c | 2 +-
> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 ++--
> drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 ++--
> drivers/media/platform/ti-vpe/vpe.c | 4 ++--
> drivers/media/platform/vicodec/vicodec-core.c | 2 --
> drivers/media/platform/vivid/vivid-core.c | 6 ++----
> .../media/platform/vivid/vivid-vid-common.c | 20 ------------------
> .../media/platform/vivid/vivid-vid-common.h | 2 --
> drivers/media/v4l2-core/v4l2-dev.c | 2 --
> drivers/media/v4l2-core/v4l2-ioctl.c | 21 ++++++++++---------
> drivers/staging/media/ipu3/ipu3-v4l2.c | 4 ++--
> .../media/rockchip/vpu/rockchip_vpu_enc.c | 4 ++--
> include/media/v4l2-ioctl.h | 14 ++-----------
> 28 files changed, 51 insertions(+), 88 deletions(-)
>
> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> index f8020ebe9f05..c3b3af3c3b2f 100644
> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> @@ -1174,7 +1174,7 @@ static const struct v4l2_file_operations cio2_v4l2_fops = {
>
> static const struct v4l2_ioctl_ops cio2_v4l2_ioctl_ops = {
> .vidioc_querycap = cio2_v4l2_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = cio2_v4l2_enum_fmt,
> + .vidioc_enum_fmt_vid_cap = cio2_v4l2_enum_fmt,
> .vidioc_g_fmt_vid_cap_mplane = cio2_v4l2_g_fmt,
> .vidioc_s_fmt_vid_cap_mplane = cio2_v4l2_s_fmt,
> .vidioc_try_fmt_vid_cap_mplane = cio2_v4l2_try_fmt,
> diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> index c757f5d98bcc..9e2914d3d8f9 100644
> --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
> +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> @@ -562,8 +562,8 @@ static int gsc_m2m_s_selection(struct file *file, void *fh,
>
> static const struct v4l2_ioctl_ops gsc_m2m_ioctl_ops = {
> .vidioc_querycap = gsc_m2m_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = gsc_m2m_enum_fmt_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = gsc_m2m_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_cap = gsc_m2m_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_out = gsc_m2m_enum_fmt_mplane,
Please rename the functions as well, dropping the _mplane suffix. Here and in
the other drivers.
> .vidioc_g_fmt_vid_cap_mplane = gsc_m2m_g_fmt_mplane,
> .vidioc_g_fmt_vid_out_mplane = gsc_m2m_g_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = gsc_m2m_try_fmt_mplane,
> diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
> index 3e9fcf4f8a13..649c3a5b4d03 100644
> --- a/drivers/media/platform/exynos4-is/fimc-capture.c
> +++ b/drivers/media/platform/exynos4-is/fimc-capture.c
> @@ -1361,7 +1361,7 @@ static int fimc_cap_s_selection(struct file *file, void *fh,
> static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = {
> .vidioc_querycap = fimc_cap_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = fimc_cap_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_cap = fimc_cap_enum_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = fimc_cap_try_fmt_mplane,
> .vidioc_s_fmt_vid_cap_mplane = fimc_cap_s_fmt_mplane,
> .vidioc_g_fmt_vid_cap_mplane = fimc_cap_g_fmt_mplane,
> diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> index bb35a2017f21..ffe10a2ea6b0 100644
> --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
> +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> @@ -551,7 +551,7 @@ static int isp_video_reqbufs(struct file *file, void *priv,
>
> static const struct v4l2_ioctl_ops isp_video_ioctl_ops = {
> .vidioc_querycap = isp_video_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = isp_video_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_cap = isp_video_enum_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = isp_video_try_fmt_mplane,
> .vidioc_s_fmt_vid_cap_mplane = isp_video_s_fmt_mplane,
> .vidioc_g_fmt_vid_cap_mplane = isp_video_g_fmt_mplane,
> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
> index 96f0a8a0dcae..b9c537d38a45 100644
> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
> @@ -954,7 +954,7 @@ static int fimc_lite_s_selection(struct file *file, void *fh,
>
> static const struct v4l2_ioctl_ops fimc_lite_ioctl_ops = {
> .vidioc_querycap = fimc_lite_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = fimc_lite_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_cap = fimc_lite_enum_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = fimc_lite_try_fmt_mplane,
> .vidioc_s_fmt_vid_cap_mplane = fimc_lite_s_fmt_mplane,
> .vidioc_g_fmt_vid_cap_mplane = fimc_lite_g_fmt_mplane,
> diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
> index 61c8177409cf..278ab067e30f 100644
> --- a/drivers/media/platform/exynos4-is/fimc-m2m.c
> +++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
> @@ -533,8 +533,8 @@ static int fimc_m2m_s_selection(struct file *file, void *fh,
>
> static const struct v4l2_ioctl_ops fimc_m2m_ioctl_ops = {
> .vidioc_querycap = fimc_m2m_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = fimc_m2m_enum_fmt_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = fimc_m2m_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_cap = fimc_m2m_enum_fmt_mplane,
> + .vidioc_enum_fmt_vid_out = fimc_m2m_enum_fmt_mplane,
> .vidioc_g_fmt_vid_cap_mplane = fimc_m2m_g_fmt_mplane,
> .vidioc_g_fmt_vid_out_mplane = fimc_m2m_g_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = fimc_m2m_try_fmt_mplane,
> diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> index f761e4d8bf2a..3b199662cb34 100644
> --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> @@ -536,8 +536,8 @@ static int mtk_jpeg_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
>
> static const struct v4l2_ioctl_ops mtk_jpeg_ioctl_ops = {
> .vidioc_querycap = mtk_jpeg_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = mtk_jpeg_enum_fmt_vid_cap,
> - .vidioc_enum_fmt_vid_out_mplane = mtk_jpeg_enum_fmt_vid_out,
> + .vidioc_enum_fmt_vid_cap = mtk_jpeg_enum_fmt_vid_cap,
> + .vidioc_enum_fmt_vid_out = mtk_jpeg_enum_fmt_vid_out,
> .vidioc_try_fmt_vid_cap_mplane = mtk_jpeg_try_fmt_vid_cap_mplane,
> .vidioc_try_fmt_vid_out_mplane = mtk_jpeg_try_fmt_vid_out_mplane,
> .vidioc_g_fmt_vid_cap_mplane = mtk_jpeg_g_fmt_vid_mplane,
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> index 7d15c06e9db9..f094d1030331 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> @@ -935,8 +935,8 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
>
> static const struct v4l2_ioctl_ops mtk_mdp_m2m_ioctl_ops = {
> .vidioc_querycap = mtk_mdp_m2m_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = mtk_mdp_m2m_enum_fmt_mplane_vid_cap,
> - .vidioc_enum_fmt_vid_out_mplane = mtk_mdp_m2m_enum_fmt_mplane_vid_out,
> + .vidioc_enum_fmt_vid_cap = mtk_mdp_m2m_enum_fmt_mplane_vid_cap,
> + .vidioc_enum_fmt_vid_out = mtk_mdp_m2m_enum_fmt_mplane_vid_out,
> .vidioc_g_fmt_vid_cap_mplane = mtk_mdp_m2m_g_fmt_mplane,
> .vidioc_g_fmt_vid_out_mplane = mtk_mdp_m2m_g_fmt_mplane,
> .vidioc_try_fmt_vid_cap_mplane = mtk_mdp_m2m_try_fmt_mplane,
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> index d022c65bb34c..1d922b8dfb6b 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> @@ -1444,8 +1444,8 @@ const struct v4l2_ioctl_ops mtk_vdec_ioctl_ops = {
>
> .vidioc_create_bufs = v4l2_m2m_ioctl_create_bufs,
>
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_vdec_enum_fmt_vid_cap_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_vdec_enum_fmt_vid_out_mplane,
> + .vidioc_enum_fmt_vid_cap = vidioc_vdec_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_fmt_vid_out = vidioc_vdec_enum_fmt_vid_out_mplane,
> .vidioc_enum_framesizes = vidioc_enum_framesizes,
>
> .vidioc_querycap = vidioc_vdec_querycap,
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index c6b48b5925fb..6ee7ced96d84 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> @@ -725,8 +725,8 @@ const struct v4l2_ioctl_ops mtk_venc_ioctl_ops = {
> .vidioc_dqbuf = vidioc_venc_dqbuf,
>
> .vidioc_querycap = vidioc_venc_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
> + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
> .vidioc_enum_framesizes = vidioc_enum_framesizes,
>
> .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap_mplane,
> diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
> index 58aebe7114cd..1d50dfbbb762 100644
> --- a/drivers/media/platform/qcom/camss/camss-video.c
> +++ b/drivers/media/platform/qcom/camss/camss-video.c
> @@ -703,7 +703,7 @@ static int video_s_input(struct file *file, void *fh, unsigned int input)
>
> static const struct v4l2_ioctl_ops msm_vid_ioctl_ops = {
> .vidioc_querycap = video_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = video_enum_fmt,
> + .vidioc_enum_fmt_vid_cap = video_enum_fmt,
> .vidioc_g_fmt_vid_cap_mplane = video_g_fmt,
> .vidioc_s_fmt_vid_cap_mplane = video_s_fmt,
> .vidioc_try_fmt_vid_cap_mplane = video_try_fmt,
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index 282de21cf2e1..2a47b9b8c5bc 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -491,8 +491,8 @@ vdec_decoder_cmd(struct file *file, void *fh, struct v4l2_decoder_cmd *cmd)
>
> static const struct v4l2_ioctl_ops vdec_ioctl_ops = {
> .vidioc_querycap = vdec_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = vdec_enum_fmt,
> - .vidioc_enum_fmt_vid_out_mplane = vdec_enum_fmt,
> + .vidioc_enum_fmt_vid_cap = vdec_enum_fmt,
> + .vidioc_enum_fmt_vid_out = vdec_enum_fmt,
> .vidioc_s_fmt_vid_cap_mplane = vdec_s_fmt,
> .vidioc_s_fmt_vid_out_mplane = vdec_s_fmt,
> .vidioc_g_fmt_vid_cap_mplane = vdec_g_fmt,
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 32cff294582f..406a47923996 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -616,8 +616,8 @@ static int venc_enum_frameintervals(struct file *file, void *fh,
>
> static const struct v4l2_ioctl_ops venc_ioctl_ops = {
> .vidioc_querycap = venc_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = venc_enum_fmt,
> - .vidioc_enum_fmt_vid_out_mplane = venc_enum_fmt,
> + .vidioc_enum_fmt_vid_cap = venc_enum_fmt,
> + .vidioc_enum_fmt_vid_out = venc_enum_fmt,
> .vidioc_s_fmt_vid_cap_mplane = venc_s_fmt,
> .vidioc_s_fmt_vid_out_mplane = venc_s_fmt,
> .vidioc_g_fmt_vid_cap_mplane = venc_g_fmt,
> diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
> index 6bda1eee9170..6e6471c37984 100644
> --- a/drivers/media/platform/rcar_fdp1.c
> +++ b/drivers/media/platform/rcar_fdp1.c
> @@ -1730,8 +1730,8 @@ static const char * const fdp1_ctrl_deint_menu[] = {
> static const struct v4l2_ioctl_ops fdp1_ioctl_ops = {
> .vidioc_querycap = fdp1_vidioc_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = fdp1_enum_fmt_vid_cap,
> - .vidioc_enum_fmt_vid_out_mplane = fdp1_enum_fmt_vid_out,
> + .vidioc_enum_fmt_vid_cap = fdp1_enum_fmt_vid_cap,
> + .vidioc_enum_fmt_vid_out = fdp1_enum_fmt_vid_out,
> .vidioc_g_fmt_vid_cap_mplane = fdp1_g_fmt,
> .vidioc_g_fmt_vid_out_mplane = fdp1_g_fmt,
> .vidioc_try_fmt_vid_cap_mplane = fdp1_try_fmt,
> diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
> index 1dfd2eb65920..a34f4e6b2f98 100644
> --- a/drivers/media/platform/rcar_jpu.c
> +++ b/drivers/media/platform/rcar_jpu.c
> @@ -948,8 +948,8 @@ static int jpu_streamon(struct file *file, void *priv, enum v4l2_buf_type type)
> static const struct v4l2_ioctl_ops jpu_ioctl_ops = {
> .vidioc_querycap = jpu_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = jpu_enum_fmt_cap,
> - .vidioc_enum_fmt_vid_out_mplane = jpu_enum_fmt_out,
> + .vidioc_enum_fmt_vid_cap = jpu_enum_fmt_cap,
> + .vidioc_enum_fmt_vid_out = jpu_enum_fmt_out,
> .vidioc_g_fmt_vid_cap_mplane = jpu_g_fmt,
> .vidioc_g_fmt_vid_out_mplane = jpu_g_fmt,
> .vidioc_try_fmt_vid_cap_mplane = jpu_try_fmt,
> diff --git a/drivers/media/platform/renesas-ceu.c b/drivers/media/platform/renesas-ceu.c
> index 150196f7cf96..57d0c0f9fa4b 100644
> --- a/drivers/media/platform/renesas-ceu.c
> +++ b/drivers/media/platform/renesas-ceu.c
> @@ -1339,7 +1339,7 @@ static int ceu_enum_frameintervals(struct file *file, void *fh,
> static const struct v4l2_ioctl_ops ceu_ioctl_ops = {
> .vidioc_querycap = ceu_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = ceu_enum_fmt_vid_cap,
> + .vidioc_enum_fmt_vid_cap = ceu_enum_fmt_vid_cap,
> .vidioc_try_fmt_vid_cap_mplane = ceu_try_fmt_vid_cap,
> .vidioc_s_fmt_vid_cap_mplane = ceu_s_fmt_vid_cap,
> .vidioc_g_fmt_vid_cap_mplane = ceu_g_fmt_vid_cap,
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> index e111f9c47179..b270ff59c5e3 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> @@ -887,8 +887,8 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
> /* v4l2_ioctl_ops */
> static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
> .vidioc_querycap = vidioc_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
> + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
> .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt,
> .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt,
> .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt,
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> index 8fcf627dedfb..2fa16ee9c7b0 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> @@ -2343,8 +2343,8 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
>
> static const struct v4l2_ioctl_ops s5p_mfc_enc_ioctl_ops = {
> .vidioc_querycap = vidioc_querycap,
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
> + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
> .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt,
> .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt,
> .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt,
> diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
> index 207e7e76c048..ddfae9f4fbfa 100644
> --- a/drivers/media/platform/ti-vpe/vpe.c
> +++ b/drivers/media/platform/ti-vpe/vpe.c
> @@ -1973,12 +1973,12 @@ static const struct v4l2_ctrl_ops vpe_ctrl_ops = {
> static const struct v4l2_ioctl_ops vpe_ioctl_ops = {
> .vidioc_querycap = vpe_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = vpe_enum_fmt,
> + .vidioc_enum_fmt_vid_cap = vpe_enum_fmt,
> .vidioc_g_fmt_vid_cap_mplane = vpe_g_fmt,
> .vidioc_try_fmt_vid_cap_mplane = vpe_try_fmt,
> .vidioc_s_fmt_vid_cap_mplane = vpe_s_fmt,
>
> - .vidioc_enum_fmt_vid_out_mplane = vpe_enum_fmt,
> + .vidioc_enum_fmt_vid_out = vpe_enum_fmt,
> .vidioc_g_fmt_vid_out_mplane = vpe_g_fmt,
> .vidioc_try_fmt_vid_out_mplane = vpe_try_fmt,
> .vidioc_s_fmt_vid_out_mplane = vpe_s_fmt,
> diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
> index d7636fe9e174..fda726e43d60 100644
> --- a/drivers/media/platform/vicodec/vicodec-core.c
> +++ b/drivers/media/platform/vicodec/vicodec-core.c
> @@ -1140,7 +1140,6 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = {
> .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
> .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap,
> .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_vid_cap,
> .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap,
> .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_vid_cap,
> @@ -1150,7 +1149,6 @@ static const struct v4l2_ioctl_ops vicodec_ioctl_ops = {
> .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
> .vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
>
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out,
> .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_vid_out,
> .vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_vid_out,
> .vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_vid_out,
> diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
> index 342e0e6c103b..345adde47789 100644
> --- a/drivers/media/platform/vivid/vivid-core.c
> +++ b/drivers/media/platform/vivid/vivid-core.c
> @@ -500,20 +500,18 @@ static const struct v4l2_file_operations vivid_radio_fops = {
> static const struct v4l2_ioctl_ops vivid_ioctl_ops = {
> .vidioc_querycap = vidioc_querycap,
>
> - .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid,
> + .vidioc_enum_fmt_vid_cap = vivid_enum_fmt_vid,
> .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
> .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
> .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_mplane,
> .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_vid_cap_mplane,
> .vidioc_try_fmt_vid_cap_mplane = vidioc_try_fmt_vid_cap_mplane,
> .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_vid_cap_mplane,
>
> - .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid,
> + .vidioc_enum_fmt_vid_out = vivid_enum_fmt_vid,
> .vidioc_g_fmt_vid_out = vidioc_g_fmt_vid_out,
> .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
> .vidioc_s_fmt_vid_out = vidioc_s_fmt_vid_out,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_mplane,
> .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_vid_out_mplane,
> .vidioc_try_fmt_vid_out_mplane = vidioc_try_fmt_vid_out_mplane,
> .vidioc_s_fmt_vid_out_mplane = vidioc_s_fmt_vid_out_mplane,
> diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
> index 74b83bcc6119..9307ce1cdd16 100644
> --- a/drivers/media/platform/vivid/vivid-vid-common.c
> +++ b/drivers/media/platform/vivid/vivid-vid-common.c
> @@ -797,26 +797,6 @@ int vivid_enum_fmt_vid(struct file *file, void *priv,
> return 0;
> }
>
> -int vidioc_enum_fmt_vid_mplane(struct file *file, void *priv,
> - struct v4l2_fmtdesc *f)
> -{
> - struct vivid_dev *dev = video_drvdata(file);
> -
> - if (!dev->multiplanar)
> - return -ENOTTY;
> - return vivid_enum_fmt_vid(file, priv, f);
> -}
> -
> -int vidioc_enum_fmt_vid(struct file *file, void *priv,
> - struct v4l2_fmtdesc *f)
> -{
> - struct vivid_dev *dev = video_drvdata(file);
> -
> - if (dev->multiplanar)
> - return -ENOTTY;
> - return vivid_enum_fmt_vid(file, priv, f);
> -}
> -
> int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id)
> {
> struct vivid_dev *dev = video_drvdata(file);
> diff --git a/drivers/media/platform/vivid/vivid-vid-common.h b/drivers/media/platform/vivid/vivid-vid-common.h
> index 29b6c0b40a1b..d908d9725283 100644
> --- a/drivers/media/platform/vivid/vivid-vid-common.h
> +++ b/drivers/media/platform/vivid/vivid-vid-common.h
> @@ -28,8 +28,6 @@ void vivid_send_source_change(struct vivid_dev *dev, unsigned type);
> int vivid_vid_adjust_sel(unsigned flags, struct v4l2_rect *r);
>
> int vivid_enum_fmt_vid(struct file *file, void *priv, struct v4l2_fmtdesc *f);
> -int vidioc_enum_fmt_vid_mplane(struct file *file, void *priv, struct v4l2_fmtdesc *f);
> -int vidioc_enum_fmt_vid(struct file *file, void *priv, struct v4l2_fmtdesc *f);
> int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *id);
> int vidioc_g_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);
> int vidioc_enum_dv_timings(struct file *file, void *_fh, struct v4l2_enum_dv_timings *timings);
> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
> index d7528f82a66a..29946a2b2752 100644
> --- a/drivers/media/v4l2-core/v4l2-dev.c
> +++ b/drivers/media/v4l2-core/v4l2-dev.c
> @@ -593,11 +593,9 @@ static void determine_valid_ioctls(struct video_device *vdev)
> if (is_vid || is_tch) {
> /* video and metadata specific ioctls */
> if ((is_rx && (ops->vidioc_enum_fmt_vid_cap ||
> - ops->vidioc_enum_fmt_vid_cap_mplane ||
> ops->vidioc_enum_fmt_vid_overlay ||
> ops->vidioc_enum_fmt_meta_cap)) ||
> (is_tx && (ops->vidioc_enum_fmt_vid_out ||
> - ops->vidioc_enum_fmt_vid_out_mplane ||
> ops->vidioc_enum_fmt_meta_out)))
> set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
> if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index f6d663934648..97ba365218fb 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
> static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> + struct video_device *vdev = video_devdata(file);
> struct v4l2_fmtdesc *p = arg;
> int ret = check_fmt(file, p->type);
>
> @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
>
> switch (p->type) {
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
fill in vdev->device_caps. While filling in vdev->device_caps is required for
new drivers, older drivers often don't do this.
You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
drivers don't fill this in.
> + (p->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))
> + break;
> +
> if (unlikely(!ops->vidioc_enum_fmt_vid_cap))
> break;
> ret = ops->vidioc_enum_fmt_vid_cap(file, fh, arg);
> break;
> - case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> - if (unlikely(!ops->vidioc_enum_fmt_vid_cap_mplane))
> - break;
> - ret = ops->vidioc_enum_fmt_vid_cap_mplane(file, fh, arg);
> - break;
> case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> if (unlikely(!ops->vidioc_enum_fmt_vid_overlay))
> break;
> ret = ops->vidioc_enum_fmt_vid_overlay(file, fh, arg);
> break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_OUTPUT_MPLANE) !=
> + (p->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE))
> + break;
See comment above.
> +
> if (unlikely(!ops->vidioc_enum_fmt_vid_out))
> break;
> ret = ops->vidioc_enum_fmt_vid_out(file, fh, arg);
> break;
> - case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> - if (unlikely(!ops->vidioc_enum_fmt_vid_out_mplane))
> - break;
> - ret = ops->vidioc_enum_fmt_vid_out_mplane(file, fh, arg);
> - break;
> case V4L2_BUF_TYPE_SDR_CAPTURE:
> if (unlikely(!ops->vidioc_enum_fmt_sdr_cap))
> break;
> diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
> index 9c0352b193a7..92240baddca4 100644
> --- a/drivers/staging/media/ipu3/ipu3-v4l2.c
> +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
> @@ -959,12 +959,12 @@ static const struct v4l2_file_operations imgu_v4l2_fops = {
> static const struct v4l2_ioctl_ops imgu_v4l2_ioctl_ops = {
> .vidioc_querycap = imgu_vidioc_querycap,
>
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap,
> + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
> .vidioc_g_fmt_vid_cap_mplane = imgu_vidioc_g_fmt,
> .vidioc_s_fmt_vid_cap_mplane = imgu_vidioc_s_fmt,
> .vidioc_try_fmt_vid_cap_mplane = imgu_vidioc_try_fmt,
>
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
> .vidioc_g_fmt_vid_out_mplane = imgu_vidioc_g_fmt,
> .vidioc_s_fmt_vid_out_mplane = imgu_vidioc_s_fmt,
> .vidioc_try_fmt_vid_out_mplane = imgu_vidioc_try_fmt,
> diff --git a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
> index ab0fb2053620..f42d8325fd33 100644
> --- a/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
> +++ b/drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
> @@ -493,8 +493,8 @@ const struct v4l2_ioctl_ops rockchip_vpu_enc_ioctl_ops = {
> .vidioc_s_fmt_vid_cap_mplane = vidioc_s_fmt_cap_mplane,
> .vidioc_g_fmt_vid_out_mplane = vidioc_g_fmt_out_mplane,
> .vidioc_g_fmt_vid_cap_mplane = vidioc_g_fmt_cap_mplane,
> - .vidioc_enum_fmt_vid_out_mplane = vidioc_enum_fmt_vid_out_mplane,
> - .vidioc_enum_fmt_vid_cap_mplane = vidioc_enum_fmt_vid_cap_mplane,
> + .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out_mplane,
> + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap_mplane,
>
> .vidioc_reqbufs = v4l2_m2m_ioctl_reqbufs,
> .vidioc_querybuf = v4l2_m2m_ioctl_querybuf,
> diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
> index 8533ece5026e..400f2e46c108 100644
> --- a/include/media/v4l2-ioctl.h
> +++ b/include/media/v4l2-ioctl.h
> @@ -26,19 +26,13 @@ struct v4l2_fh;
> * :ref:`VIDIOC_QUERYCAP <vidioc_querycap>` ioctl
> * @vidioc_enum_fmt_vid_cap: pointer to the function that implements
> * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> - * for video capture in single plane mode
> + * for video capture in single and multi plane mode
> * @vidioc_enum_fmt_vid_overlay: pointer to the function that implements
> * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> * for video overlay
> * @vidioc_enum_fmt_vid_out: pointer to the function that implements
> * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> - * for video output in single plane mode
> - * @vidioc_enum_fmt_vid_cap_mplane: pointer to the function that implements
> - * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> - * for video capture in multiplane mode
> - * @vidioc_enum_fmt_vid_out_mplane: pointer to the function that implements
> - * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> - * for video output in multiplane mode
> + * for video output in single and multi plane mode
> * @vidioc_enum_fmt_sdr_cap: pointer to the function that implements
> * :ref:`VIDIOC_ENUM_FMT <vidioc_enum_fmt>` ioctl logic
> * for Software Defined Radio capture
> @@ -313,10 +307,6 @@ struct v4l2_ioctl_ops {
> struct v4l2_fmtdesc *f);
> int (*vidioc_enum_fmt_vid_out)(struct file *file, void *fh,
> struct v4l2_fmtdesc *f);
> - int (*vidioc_enum_fmt_vid_cap_mplane)(struct file *file, void *fh,
> - struct v4l2_fmtdesc *f);
> - int (*vidioc_enum_fmt_vid_out_mplane)(struct file *file, void *fh,
> - struct v4l2_fmtdesc *f);
> int (*vidioc_enum_fmt_sdr_cap)(struct file *file, void *fh,
> struct v4l2_fmtdesc *f);
> int (*vidioc_enum_fmt_sdr_out)(struct file *file, void *fh,
>
Regards,
Hans
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more)
2019-04-04 8:16 ` [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more) Boris Brezillon
@ 2019-04-11 8:24 ` Hans Verkuil
2019-04-11 8:37 ` Boris Brezillon
0 siblings, 1 reply; 25+ messages in thread
From: Hans Verkuil @ 2019-04-11 8:24 UTC (permalink / raw)
To: Boris Brezillon, Mauro Carvalho Chehab, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
On 4/4/19 10:16 AM, Boris Brezillon wrote:
> This is part of the multiplanar and singleplanar unification process.
> v4l2_ext_pix_format is supposed to work for both cases.
>
> We also add the concept of modifiers already employed in DRM to expose
> HW-specific formats (like tiled or compressed formats) and allow
> exchanging this information with the DRM subsystem in a consistent way.
>
> Note that V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY and
> V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE types are no longer accepted
> in v4l2_ext_format and will be rejected if you use the {G,S,TRY}EXT_FMT
> ioctls. V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE is dropped as part
> of the multiplanar/singleplanar unification.
> V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY seems to be used mostly on old
> drivers and supporting it would require some extra rework.
>
> New hooks have been added to v4l2_ioctl_ops to support those new ioctls
> in drivers, but, in the meantime, the core takes care of converting
> {S,G,TRY}_EXT_FMT requests into {S,G,TRY}_FMT so that old drivers can
> still work if the userspace app/lib uses the new ioctls.
> The conversion is also done the other around to allow userspace
> apps/libs using {S,G,TRY}_FMT to work with drivers implementing the
> _ext_ hooks.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
> Changes in v2:
> - Move the modifier in v4l2_ext_format (was formerly placed in
> v4l2_ext_plane)
> - Fix a few bugs in the converters and add a strict parameter to
> allow conversion of uninitialized/mis-initialized objects
> ---
> drivers/media/v4l2-core/v4l2-dev.c | 24 +-
> drivers/media/v4l2-core/v4l2-ioctl.c | 692 ++++++++++++++++++++++++---
> include/media/v4l2-ioctl.h | 33 ++
> include/uapi/linux/videodev2.h | 81 ++++
> 4 files changed, 749 insertions(+), 81 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
> index 29946a2b2752..a233e0924ed3 100644
> --- a/drivers/media/v4l2-core/v4l2-dev.c
> +++ b/drivers/media/v4l2-core/v4l2-dev.c
> @@ -599,32 +599,44 @@ static void determine_valid_ioctls(struct video_device *vdev)
> ops->vidioc_enum_fmt_meta_out)))
> set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
> if ((is_rx && (ops->vidioc_g_fmt_vid_cap ||
> + ops->vidioc_g_ext_fmt_vid_cap ||
> ops->vidioc_g_fmt_vid_cap_mplane ||
> ops->vidioc_g_fmt_vid_overlay ||
> ops->vidioc_g_fmt_meta_cap)) ||
> (is_tx && (ops->vidioc_g_fmt_vid_out ||
> + ops->vidioc_g_ext_fmt_vid_out ||
> ops->vidioc_g_fmt_vid_out_mplane ||
> ops->vidioc_g_fmt_vid_out_overlay ||
> - ops->vidioc_g_fmt_meta_out)))
> - set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
> + ops->vidioc_g_fmt_meta_out))) {
> + set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
> + set_bit(_IOC_NR(VIDIOC_G_EXT_FMT), valid_ioctls);
> + }
> if ((is_rx && (ops->vidioc_s_fmt_vid_cap ||
> + ops->vidioc_s_ext_fmt_vid_cap ||
> ops->vidioc_s_fmt_vid_cap_mplane ||
> ops->vidioc_s_fmt_vid_overlay ||
> ops->vidioc_s_fmt_meta_cap)) ||
> (is_tx && (ops->vidioc_s_fmt_vid_out ||
> + ops->vidioc_s_ext_fmt_vid_out ||
> ops->vidioc_s_fmt_vid_out_mplane ||
> ops->vidioc_s_fmt_vid_out_overlay ||
> - ops->vidioc_s_fmt_meta_out)))
> - set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
> + ops->vidioc_s_fmt_meta_out))) {
> + set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
> + set_bit(_IOC_NR(VIDIOC_S_EXT_FMT), valid_ioctls);
> + }
> if ((is_rx && (ops->vidioc_try_fmt_vid_cap ||
> + ops->vidioc_try_ext_fmt_vid_cap ||
> ops->vidioc_try_fmt_vid_cap_mplane ||
> ops->vidioc_try_fmt_vid_overlay ||
> ops->vidioc_try_fmt_meta_cap)) ||
> (is_tx && (ops->vidioc_try_fmt_vid_out ||
> + ops->vidioc_try_ext_fmt_vid_out ||
> ops->vidioc_try_fmt_vid_out_mplane ||
> ops->vidioc_try_fmt_vid_out_overlay ||
> - ops->vidioc_try_fmt_meta_out)))
> - set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
> + ops->vidioc_try_fmt_meta_out))) {
> + set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
> + set_bit(_IOC_NR(VIDIOC_TRY_EXT_FMT), valid_ioctls);
> + }
> SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay);
> SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf);
> SET_VALID_IOCTL(ops, VIDIOC_S_FBUF, vidioc_s_fbuf);
> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> index 97ba365218fb..f9001efa0aa5 100644
> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> @@ -381,6 +381,82 @@ static void v4l_print_format(const void *arg, bool write_only)
> }
> }
>
> +static void v4l_print_ext_format(const void *arg, bool write_only)
> +{
> + const struct v4l2_ext_format *p = arg;
> + const struct v4l2_ext_pix_format *pix;
> + const struct v4l2_vbi_format *vbi;
> + const struct v4l2_sliced_vbi_format *sliced;
> + const struct v4l2_sdr_format *sdr;
> + const struct v4l2_meta_format *meta;
> + unsigned int i;
> + u32 planes;
> +
> + pr_cont("type=%s", prt_names(p->type, v4l2_type_names));
> + switch (p->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + pix = &p->fmt.pix;
> + pr_cont(", width=%u, height=%u, format=%c%c%c%c, modifier %llx, field=%s, colorspace=%d, num_planes=%u, flags=0x%x, ycbcr_enc=%u, quantization=%u, xfer_func=%u\n",
> + pix->width, pix->height,
> + (pix->pixelformat & 0xff),
> + (pix->pixelformat >> 8) & 0xff,
> + (pix->pixelformat >> 16) & 0xff,
> + (pix->pixelformat >> 24) & 0xff,
> + pix->modifier, prt_names(pix->field, v4l2_field_names),
> + pix->colorspace, pix->num_planes, pix->flags,
> + pix->ycbcr_enc, pix->quantization, pix->xfer_func);
> + planes = min_t(u32, pix->num_planes, VIDEO_MAX_PLANES);
> + for (i = 0; i < planes; i++)
> + pr_debug("plane %u: bytesperline=%u sizeimage=%u\n",
> + i, pix->plane_fmt[i].bytesperline,
> + pix->plane_fmt[i].sizeimage);
> + break;
> + case V4L2_BUF_TYPE_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_VBI_OUTPUT:
> + vbi = &p->fmt.vbi;
> + pr_cont(", sampling_rate=%u, offset=%u, samples_per_line=%u, sample_format=%c%c%c%c, start=%u,%u, count=%u,%u\n",
> + vbi->sampling_rate, vbi->offset,
> + vbi->samples_per_line,
> + (vbi->sample_format & 0xff),
> + (vbi->sample_format >> 8) & 0xff,
> + (vbi->sample_format >> 16) & 0xff,
> + (vbi->sample_format >> 24) & 0xff,
> + vbi->start[0], vbi->start[1],
> + vbi->count[0], vbi->count[1]);
> + break;
> + case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
> + sliced = &p->fmt.sliced;
> + pr_cont(", service_set=0x%08x, io_size=%d\n",
> + sliced->service_set, sliced->io_size);
> + for (i = 0; i < 24; i++)
> + pr_debug("line[%02u]=0x%04x, 0x%04x\n", i,
> + sliced->service_lines[0][i],
> + sliced->service_lines[1][i]);
> + break;
> + case V4L2_BUF_TYPE_SDR_CAPTURE:
> + case V4L2_BUF_TYPE_SDR_OUTPUT:
> + sdr = &p->fmt.sdr;
> + pr_cont(", pixelformat=%c%c%c%c\n",
> + (sdr->pixelformat >> 0) & 0xff,
> + (sdr->pixelformat >> 8) & 0xff,
> + (sdr->pixelformat >> 16) & 0xff,
> + (sdr->pixelformat >> 24) & 0xff);
> + break;
> + case V4L2_BUF_TYPE_META_CAPTURE:
> + case V4L2_BUF_TYPE_META_OUTPUT:
> + meta = &p->fmt.meta;
> + pr_cont(", dataformat=%c%c%c%c, buffersize=%u\n",
> + (meta->dataformat >> 0) & 0xff,
> + (meta->dataformat >> 8) & 0xff,
> + (meta->dataformat >> 16) & 0xff,
> + (meta->dataformat >> 24) & 0xff,
> + meta->buffersize);
> + break;
> + }
> +}
> +
> static void v4l_print_framebuffer(const void *arg, bool write_only)
> {
> const struct v4l2_framebuffer *p = arg;
> @@ -951,11 +1027,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
> switch (type) {
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> if ((is_vid || is_tch) && is_rx &&
> - (ops->vidioc_g_fmt_vid_cap || ops->vidioc_g_fmt_vid_cap_mplane))
> + (ops->vidioc_g_fmt_vid_cap ||
> + ops->vidioc_g_ext_fmt_vid_cap ||
> + ops->vidioc_g_fmt_vid_cap_mplane))
> return 0;
> break;
> case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> - if (is_vid && is_rx && ops->vidioc_g_fmt_vid_cap_mplane)
> + if (is_vid && is_rx &&
> + (ops->vidioc_g_fmt_vid_cap_mplane ||
> + ops->vidioc_g_ext_fmt_vid_cap))
Is this right? I thought that V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE was to be refused
when used with the new ioctls? Perhaps check_fmt needs an extra argument that
tells it whether it is called from the new ioctls or not.
> return 0;
> break;
> case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> @@ -964,11 +1044,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
> break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> if (is_vid && is_tx &&
> - (ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out_mplane))
> + (ops->vidioc_g_fmt_vid_out ||
> + ops->vidioc_g_ext_fmt_vid_out ||
> + ops->vidioc_g_fmt_vid_out_mplane))
> return 0;
> break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> - if (is_vid && is_tx && ops->vidioc_g_fmt_vid_out_mplane)
> + if (is_vid && is_tx &&
> + (ops->vidioc_g_ext_fmt_vid_out ||
> + ops->vidioc_g_fmt_vid_out_mplane))
> return 0;
> break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> @@ -1048,6 +1132,197 @@ static void v4l_sanitize_format(struct v4l2_format *fmt)
> sizeof(fmt->fmt.pix) - offset);
> }
>
> +int v4l2_ext_format_to_format(const struct v4l2_ext_format *e,
> + struct v4l2_format *f, bool mplane_cap,
> + bool strict)
> +{
> + const struct v4l2_plane_ext_pix_format *pe;
> + struct v4l2_plane_pix_format *p;
> + unsigned int i;
> +
> + memset(f, 0, sizeof(*f));
> +
> + switch (e->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + /*
> + * Make sure no modifier is required before doing the
> + * conversion.
> + */
> + if (e->fmt.pix.modifier && strict)
> + return -EINVAL;
> +
> + if ((e->fmt.pix.num_planes > VIDEO_MAX_PLANES ||
> + !e->fmt.pix.num_planes) && strict)
> + return -EINVAL;
> +
> + if (e->fmt.pix.num_planes > 1 && !mplane_cap && strict)
> + return -EINVAL;
> +
> + if (!mplane_cap) {
> + f->fmt.pix.width = e->fmt.pix.width;
> + f->fmt.pix.height = e->fmt.pix.height;
> + f->fmt.pix.pixelformat = e->fmt.pix.pixelformat;
> + f->fmt.pix.field = e->fmt.pix.field;
> + f->fmt.pix.colorspace = e->fmt.pix.colorspace;
> + f->fmt.pix.flags = e->fmt.pix.flags;
> + f->fmt.pix.ycbcr_enc = e->fmt.pix.ycbcr_enc;
> + f->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + f->fmt.pix.quantization = e->fmt.pix.quantization;
> + pe = &e->fmt.pix.plane_fmt[0];
> + f->fmt.pix.bytesperline = pe->bytesperline;
> + f->fmt.pix.sizeimage = pe->sizeimage;
> + f->type = e->type;
> + break;
> + }
> +
> + f->fmt.pix_mp.width = e->fmt.pix.width;
> + f->fmt.pix_mp.height = e->fmt.pix.height;
> + f->fmt.pix_mp.pixelformat = e->fmt.pix.pixelformat;
> + f->fmt.pix_mp.field = e->fmt.pix.field;
> + f->fmt.pix_mp.colorspace = e->fmt.pix.colorspace;
> + f->fmt.pix_mp.flags = e->fmt.pix.flags;
> + f->fmt.pix_mp.ycbcr_enc = e->fmt.pix.ycbcr_enc;
> + f->fmt.pix_mp.quantization = e->fmt.pix.quantization;
> + if (e->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
> + f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> + else
> + f->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
> +
> + for (i = 0; i < VIDEO_MAX_PLANES; i++) {
> + pe = &e->fmt.pix.plane_fmt[i];
> + p = &f->fmt.pix_mp.plane_fmt[i];
> + p->bytesperline = pe->bytesperline;
> + p->sizeimage = pe->sizeimage;
> + }
> + break;
> +
> + case V4L2_BUF_TYPE_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_VBI_OUTPUT:
> + f->type = e->type;
> + f->fmt.vbi = e->fmt.vbi;
> + break;
> +
> + case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
> + f->type = e->type;
> + f->fmt.sliced = e->fmt.sliced;
> + break;
> +
> + case V4L2_BUF_TYPE_SDR_CAPTURE:
> + case V4L2_BUF_TYPE_SDR_OUTPUT:
> + f->type = e->type;
> + f->fmt.sdr = e->fmt.sdr;
> + break;
> +
> + case V4L2_BUF_TYPE_META_CAPTURE:
> + case V4L2_BUF_TYPE_META_OUTPUT:
> + f->type = e->type;
> + f->fmt.meta = e->fmt.meta;
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_ext_format_to_format);
> +
> +int v4l2_format_to_ext_format(const struct v4l2_format *f,
> + struct v4l2_ext_format *e, bool strict)
> +{
> + const struct v4l2_plane_pix_format *p;
> + struct v4l2_plane_ext_pix_format *pe;
> + unsigned int i;
> +
> + memset(e, 0, sizeof(*e));
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + e->fmt.pix.width = f->fmt.pix.width;
> + e->fmt.pix.height = f->fmt.pix.height;
> + e->fmt.pix.pixelformat = f->fmt.pix.pixelformat;
> + e->fmt.pix.field = f->fmt.pix.field;
> + e->fmt.pix.colorspace = f->fmt.pix.colorspace;
> + e->fmt.pix.flags = f->fmt.pix.flags;
> + e->fmt.pix.ycbcr_enc = f->fmt.pix.ycbcr_enc;
> + e->fmt.pix.quantization = f->fmt.pix.quantization;
> + e->fmt.pix.num_planes = 1;
> + e->fmt.pix.plane_fmt[0].bytesperline = f->fmt.pix.bytesperline;
> + e->fmt.pix.plane_fmt[0].sizeimage = f->fmt.pix.sizeimage;
> + e->type = f->type;
> + break;
> +
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + if ((f->fmt.pix_mp.num_planes > VIDEO_MAX_PLANES ||
> + !f->fmt.pix_mp.num_planes) && strict)
> + return -EINVAL;
> +
> + e->fmt.pix.width = f->fmt.pix_mp.width;
> + e->fmt.pix.height = f->fmt.pix_mp.height;
> + e->fmt.pix.pixelformat = f->fmt.pix_mp.pixelformat;
> + e->fmt.pix.field = f->fmt.pix_mp.field;
> + e->fmt.pix.colorspace = f->fmt.pix_mp.colorspace;
> + e->fmt.pix.flags = f->fmt.pix_mp.flags;
> + e->fmt.pix.ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
> + e->fmt.pix.quantization = f->fmt.pix_mp.quantization;
> + e->fmt.pix.num_planes = f->fmt.pix_mp.num_planes;
> + if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
> + e->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> + else
> + e->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> +
> + for (i = 0; i < VIDEO_MAX_PLANES; i++) {
> + pe = &e->fmt.pix.plane_fmt[i];
> + p = &f->fmt.pix_mp.plane_fmt[i];
> + pe->bytesperline = p->bytesperline;
> + pe->sizeimage = p->sizeimage;
> + }
> + break;
> +
> + case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> + /*
> + * OVERLAY formats are not supported by the _EXT_FMT
> + * ioctl()s.
> + */
> + return -EINVAL;
> +
> + case V4L2_BUF_TYPE_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_VBI_OUTPUT:
> + e->type = f->type;
> + e->fmt.vbi = f->fmt.vbi;
> + break;
> +
> + case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
> + case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
> + e->type = f->type;
> + e->fmt.sliced = f->fmt.sliced;
> + break;
> +
> + case V4L2_BUF_TYPE_SDR_CAPTURE:
> + case V4L2_BUF_TYPE_SDR_OUTPUT:
> + e->type = f->type;
> + e->fmt.sdr = f->fmt.sdr;
> + break;
> +
> + case V4L2_BUF_TYPE_META_CAPTURE:
> + case V4L2_BUF_TYPE_META_OUTPUT:
> + e->type = f->type;
> + e->fmt.meta = f->fmt.meta;
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_format_to_ext_format);
> +
> static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> @@ -1440,6 +1715,38 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> return ret;
> }
>
> +static int v4l_g_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct v4l2_ext_format ef = {
> + .type = f->type,
> + };
> + int ret;
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + ret = ops->vidioc_g_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
This will call vidioc_g_ext_fmt_vid_cap with type _MPLANE, which we said we
wouldn't support for the extended ioctls.
> + break;
> +
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + ret = ops->vidioc_g_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + if (ret)
> + return ret;
> +
> + return v4l2_ext_format_to_format(&ef, f,
> + V4L2_TYPE_IS_MULTIPLANAR(f->type),
> + true);
> +}
> +
> static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> @@ -1475,15 +1782,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
>
> switch (p->type) {
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> - if (unlikely(!ops->vidioc_g_fmt_vid_cap))
> - break;
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - return ret;
> + if (ops->vidioc_g_fmt_vid_cap) {
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + return ret;
> + } else if (ops->vidioc_g_ext_fmt_vid_cap) {
> + return v4l_g_fmt_ext_pix(ops, file, fh, p);
Test for the extended op first. Same elsewhere below. E.g.:
if (ops->vidioc_g_ext_fmt_vid_cap)
return v4l_g_fmt_ext_pix(ops, file, fh, p);
if (unlikely(!ops->vidioc_g_fmt_vid_cap))
break;
p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
...
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> - return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
> + if (ops->vidioc_g_fmt_vid_cap_mplane)
> + return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
> + else if (ops->vidioc_g_ext_fmt_vid_cap)
> + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> + break;
> case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> return ops->vidioc_g_fmt_vid_overlay(file, fh, arg);
> case V4L2_BUF_TYPE_VBI_CAPTURE:
> @@ -1491,15 +1805,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
> return ops->vidioc_g_fmt_sliced_vbi_cap(file, fh, arg);
> case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> - if (unlikely(!ops->vidioc_g_fmt_vid_out))
> - break;
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - return ret;
> + if (ops->vidioc_g_fmt_vid_out) {
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + return ret;
> + } else if (ops->vidioc_g_ext_fmt_vid_out) {
> + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> - return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
> + if (ops->vidioc_g_fmt_vid_out_mplane)
> + return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
> + else if (ops->vidioc_g_ext_fmt_vid_out)
> + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> return ops->vidioc_g_fmt_vid_out_overlay(file, fh, arg);
> case V4L2_BUF_TYPE_VBI_OUTPUT:
> @@ -1518,6 +1839,43 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> return -EINVAL;
> }
>
> +static int v4l_g_ext_fmt(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh, void *arg)
> +{
> + struct v4l2_ext_format *ef = arg;
> + struct v4l2_format f = {
> + .type = ef->type,
> + };
> + int ret;
> +
> + ret = check_fmt(file, ef->type);
> + if (ret)
> + return ret;
> +
> + memset(&ef->fmt, 0, sizeof(ef->fmt));
> +
> + switch (ef->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + if (ops->vidioc_g_ext_fmt_vid_cap)
> + return ops->vidioc_g_ext_fmt_vid_cap(file, fh,
> + &ef->fmt.pix);
> + break;
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + if (ops->vidioc_g_ext_fmt_vid_out)
> + return ops->vidioc_g_ext_fmt_vid_out(file, fh,
> + &ef->fmt.pix);
> + break;
> + default:
> + break;
> + }
> +
> + ret = v4l_g_fmt(ops, file, fh, &f);
> + if (ret)
> + return ret;
> +
> + return v4l2_format_to_ext_format(&f, ef, true);
> +}
> +
> static void v4l_pix_format_touch(struct v4l2_pix_format *p)
> {
> /*
> @@ -1533,6 +1891,40 @@ static void v4l_pix_format_touch(struct v4l2_pix_format *p)
> p->xfer_func = 0;
> }
>
> +static int v4l_s_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct v4l2_ext_format ef;
> + int ret;
> +
> + ret = v4l2_format_to_ext_format(f, &ef, false);
> + if (ret)
> + return ret;
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + ret = ops->vidioc_s_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
> + break;
> +
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + ret = ops->vidioc_s_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + if (ret)
> + return ret;
> +
> + return v4l2_ext_format_to_format(&ef, f,
> + V4L2_TYPE_IS_MULTIPLANAR(f->type),
> + true);
> +}
> +
> static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> @@ -1551,23 +1943,31 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
>
> switch (p->type) {
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> - if (unlikely(!ops->vidioc_s_fmt_vid_cap))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix);
> - ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + if (ops->vidioc_s_fmt_vid_cap) {
> + CLEAR_AFTER_FIELD(p, fmt.pix);
> + ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + } else if (ops->vidioc_s_ext_fmt_vid_cap) {
> + ret = v4l_s_fmt_ext_pix(ops, file, fh, arg);
The helper functions v4l_[g/s/try]_fmt_ext_pix are confusingly named.
How about: v4l_[g/s/try]_fmt_using_ext_fmt.
> + } else {
> + ret = -EINVAL;
> + }
> +
> if (vfd->vfl_type == VFL_TYPE_TOUCH)
> v4l_pix_format_touch(&p->fmt.pix);
> return ret;
> case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> - if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> - for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> - CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> - bytesperline);
> - return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
> + if (ops->vidioc_s_fmt_vid_cap_mplane) {
> + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> + CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> + bytesperline);
> + return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);
> + } else if (ops->vidioc_s_ext_fmt_vid_cap) {
> + return v4l_s_fmt_ext_pix(ops, file, fh, arg);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> if (unlikely(!ops->vidioc_s_fmt_vid_overlay))
> break;
> @@ -1584,21 +1984,27 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> CLEAR_AFTER_FIELD(p, fmt.sliced);
> return ops->vidioc_s_fmt_sliced_vbi_cap(file, fh, arg);
> case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> - if (unlikely(!ops->vidioc_s_fmt_vid_out))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix);
> - ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - return ret;
> + if (ops->vidioc_s_fmt_vid_out) {
> + CLEAR_AFTER_FIELD(p, fmt.pix);
> + ret = ops->vidioc_s_fmt_vid_out(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + return ret;
> + } else if (ops->vidioc_s_ext_fmt_vid_out) {
> + return v4l_s_fmt_ext_pix(ops, file, fh, arg);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> - if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> - for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> - CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> - bytesperline);
> - return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
> + if (ops->vidioc_s_fmt_vid_out_mplane) {
> + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> + CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> + bytesperline);
> + return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);
> + } else if (ops->vidioc_s_ext_fmt_vid_out) {
> + return v4l_s_fmt_ext_pix(ops, file, fh, arg);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay))
> break;
> @@ -1638,6 +2044,84 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> return -EINVAL;
> }
>
> +static int v4l_s_ext_fmt(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh, void *arg)
> +{
> + struct video_device *vfd = video_devdata(file);
> + struct v4l2_ext_format *ef = arg;
> + struct v4l2_format f;
> + int ret;
> +
> + ret = check_fmt(file, ef->type);
> + if (ret)
> + return ret;
> +
> + switch (ef->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + if (ops->vidioc_s_ext_fmt_vid_cap)
> + return ops->vidioc_s_ext_fmt_vid_cap(file, fh,
> + &ef->fmt.pix);
> + break;
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + if (ops->vidioc_s_ext_fmt_vid_out)
> + return ops->vidioc_s_ext_fmt_vid_out(file, fh,
> + &ef->fmt.pix);
> + break;
> + default:
> + break;
> + }
> +
> + ret = v4l2_ext_format_to_format(ef, &f,
> + vfd->device_caps &
> + (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
> + V4L2_CAP_VIDEO_OUTPUT_MPLANE |
> + V4L2_CAP_VIDEO_M2M_MPLANE),
> + false);
> + if (ret)
> + return ret;
> +
> + ret = v4l_s_fmt(ops, file, fh, &f);
> + if (ret)
> + return ret;
> +
> + return v4l2_format_to_ext_format(&f, ef, true);
> +}
> +
> +static int v4l_try_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh,
> + struct v4l2_format *f)
> +{
> + struct v4l2_ext_format ef;
> + int ret;
> +
> + ret = v4l2_format_to_ext_format(f, &ef, false);
> + if (ret)
> + return ret;
> +
> + switch (f->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> + ret = ops->vidioc_try_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
> + break;
> +
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + ret = ops->vidioc_try_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + if (ret)
> + return ret;
> +
> + return v4l2_ext_format_to_format(&ef, f,
> + V4L2_TYPE_IS_MULTIPLANAR(f->type),
> + true);
> +
> +}
> +
> static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> @@ -1652,21 +2136,27 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
>
> switch (p->type) {
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> - if (unlikely(!ops->vidioc_try_fmt_vid_cap))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix);
> - ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - return ret;
> + if (ops->vidioc_try_fmt_vid_cap) {
> + CLEAR_AFTER_FIELD(p, fmt.pix);
> + ret = ops->vidioc_try_fmt_vid_cap(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + return ret;
> + } else if (ops->vidioc_try_ext_fmt_vid_cap) {
> + return v4l_try_fmt_ext_pix(ops, file, fh, p);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> - if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> - for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> - CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> - bytesperline);
> - return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
> + if (ops->vidioc_try_fmt_vid_cap_mplane) {
> + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> + CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> + bytesperline);
> + return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);
> + } else if (ops->vidioc_try_ext_fmt_vid_cap) {
> + return v4l_try_fmt_ext_pix(ops, file, fh, p);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> if (unlikely(!ops->vidioc_try_fmt_vid_overlay))
> break;
> @@ -1683,21 +2173,27 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> CLEAR_AFTER_FIELD(p, fmt.sliced);
> return ops->vidioc_try_fmt_sliced_vbi_cap(file, fh, arg);
> case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> - if (unlikely(!ops->vidioc_try_fmt_vid_out))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix);
> - ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
> - /* just in case the driver zeroed it again */
> - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> - return ret;
> + if (ops->vidioc_try_fmt_vid_out) {
> + CLEAR_AFTER_FIELD(p, fmt.pix);
> + ret = ops->vidioc_try_fmt_vid_out(file, fh, arg);
> + /* just in case the driver zeroed it again */
> + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> + return ret;
> + } else if (ops->vidioc_try_ext_fmt_vid_cap) {
> + return v4l_try_fmt_ext_pix(ops, file, fh, p);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> - if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))
> - break;
> - CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> - for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> - CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> - bytesperline);
> - return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
> + if (ops->vidioc_try_fmt_vid_out_mplane) {
> + CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);
> + for (i = 0; i < p->fmt.pix_mp.num_planes; i++)
> + CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i],
> + bytesperline);
> + return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);
> + } else if (ops->vidioc_try_ext_fmt_vid_cap) {
> + return v4l_try_fmt_ext_pix(ops, file, fh, p);
> + }
> + break;
> case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay))
> break;
> @@ -1737,6 +2233,49 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
> return -EINVAL;
> }
>
> +static int v4l_try_ext_fmt(const struct v4l2_ioctl_ops *ops,
> + struct file *file, void *fh, void *arg)
> +{
> + struct video_device *vfd = video_devdata(file);
> + struct v4l2_ext_format *ef = arg;
> + struct v4l2_format f;
> + int ret;
> +
> + ret = check_fmt(file, ef->type);
> + if (ret)
> + return ret;
> +
> + switch (ef->type) {
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> + if (ops->vidioc_try_ext_fmt_vid_cap)
> + return ops->vidioc_try_ext_fmt_vid_cap(file, fh,
> + &ef->fmt.pix);
> + break;
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> + if (ops->vidioc_try_ext_fmt_vid_out)
> + return ops->vidioc_try_ext_fmt_vid_out(file, fh,
> + &ef->fmt.pix);
> + break;
> + default:
> + break;
> + }
> +
> + ret = v4l2_ext_format_to_format(ef, &f,
> + vfd->device_caps &
> + (V4L2_CAP_VIDEO_CAPTURE_MPLANE |
> + V4L2_CAP_VIDEO_OUTPUT_MPLANE |
> + V4L2_CAP_VIDEO_M2M_MPLANE),
> + false);
> + if (ret)
> + return ret;
> +
> + ret = v4l_try_fmt(ops, file, fh, &f);
> + if (ret)
> + return ret;
> +
> + return v4l2_format_to_ext_format(&f, ef, true);
> +}
> +
> static int v4l_streamon(const struct v4l2_ioctl_ops *ops,
> struct file *file, void *fh, void *arg)
> {
> @@ -2655,7 +3194,9 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
> IOCTL_INFO(VIDIOC_QUERYCAP, v4l_querycap, v4l_print_querycap, 0),
> IOCTL_INFO(VIDIOC_ENUM_FMT, v4l_enum_fmt, v4l_print_fmtdesc, INFO_FL_CLEAR(v4l2_fmtdesc, type)),
> IOCTL_INFO(VIDIOC_G_FMT, v4l_g_fmt, v4l_print_format, 0),
> + IOCTL_INFO(VIDIOC_G_EXT_FMT, v4l_g_ext_fmt, v4l_print_ext_format, 0),
> IOCTL_INFO(VIDIOC_S_FMT, v4l_s_fmt, v4l_print_format, INFO_FL_PRIO),
> + IOCTL_INFO(VIDIOC_S_EXT_FMT, v4l_s_ext_fmt, v4l_print_ext_format, INFO_FL_PRIO),
> IOCTL_INFO(VIDIOC_REQBUFS, v4l_reqbufs, v4l_print_requestbuffers, INFO_FL_PRIO | INFO_FL_QUEUE),
> IOCTL_INFO(VIDIOC_QUERYBUF, v4l_querybuf, v4l_print_buffer, INFO_FL_QUEUE | INFO_FL_CLEAR(v4l2_buffer, length)),
> IOCTL_INFO(VIDIOC_G_FBUF, v4l_stub_g_fbuf, v4l_print_framebuffer, 0),
> @@ -2702,6 +3243,7 @@ static const struct v4l2_ioctl_info v4l2_ioctls[] = {
> IOCTL_INFO(VIDIOC_S_JPEGCOMP, v4l_stub_s_jpegcomp, v4l_print_jpegcompression, INFO_FL_PRIO),
> IOCTL_INFO(VIDIOC_QUERYSTD, v4l_querystd, v4l_print_std, 0),
> IOCTL_INFO(VIDIOC_TRY_FMT, v4l_try_fmt, v4l_print_format, 0),
> + IOCTL_INFO(VIDIOC_TRY_EXT_FMT, v4l_try_ext_fmt, v4l_print_ext_format, 0),
> IOCTL_INFO(VIDIOC_ENUMAUDIO, v4l_stub_enumaudio, v4l_print_audio, INFO_FL_CLEAR(v4l2_audio, index)),
> IOCTL_INFO(VIDIOC_ENUMAUDOUT, v4l_stub_enumaudout, v4l_print_audioout, INFO_FL_CLEAR(v4l2_audioout, index)),
> IOCTL_INFO(VIDIOC_G_PRIORITY, v4l_g_priority, v4l_print_u32, 0),
> diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
> index 400f2e46c108..a1fb5eac144b 100644
> --- a/include/media/v4l2-ioctl.h
> +++ b/include/media/v4l2-ioctl.h
> @@ -48,11 +48,16 @@ struct v4l2_fh;
> * @vidioc_g_fmt_vid_cap: pointer to the function that implements
> * :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video capture
> * in single plane mode
> + * @vidioc_g_ext_fmt_vid_cap: pointer to the function that implements
> + * :ref:`VIDIOC_G_EXT_FMT <vidioc_g_ext_fmt>` ioctl logic for video
> + * capture
> * @vidioc_g_fmt_vid_overlay: pointer to the function that implements
> * :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay
> * @vidioc_g_fmt_vid_out: pointer to the function that implements
> * :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video out
> * in single plane mode
> + * @vidioc_g_ext_fmt_vid_out: pointer to the function that implements
> + * :ref:`VIDIOC_G_EXT_FMT <vidioc_g_ext_fmt>` ioctl logic for video out
> * @vidioc_g_fmt_vid_out_overlay: pointer to the function that implements
> * :ref:`VIDIOC_G_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
> * @vidioc_g_fmt_vbi_cap: pointer to the function that implements
> @@ -82,11 +87,16 @@ struct v4l2_fh;
> * @vidioc_s_fmt_vid_cap: pointer to the function that implements
> * :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video capture
> * in single plane mode
> + * @vidioc_s_ext_fmt_vid_cap: pointer to the function that implements
> + * :ref:`VIDIOC_S_EXT_FMT <vidioc_s_ext_fmt>` ioctl logic for video
> + * capture
> * @vidioc_s_fmt_vid_overlay: pointer to the function that implements
> * :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay
> * @vidioc_s_fmt_vid_out: pointer to the function that implements
> * :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video out
> * in single plane mode
> + * @vidioc_s_ext_fmt_vid_out: pointer to the function that implements
> + * :ref:`VIDIOC_S_EXT_FMT <vidioc_g_fmt>` ioctl logic for video out
> * @vidioc_s_fmt_vid_out_overlay: pointer to the function that implements
> * :ref:`VIDIOC_S_FMT <vidioc_g_fmt>` ioctl logic for video overlay output
> * @vidioc_s_fmt_vbi_cap: pointer to the function that implements
> @@ -116,11 +126,16 @@ struct v4l2_fh;
> * @vidioc_try_fmt_vid_cap: pointer to the function that implements
> * :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video capture
> * in single plane mode
> + * @vidioc_try_ext_fmt_vid_cap: pointer to the function that implements
> + * :ref:`VIDIOC_TRY_EXT_FMT <vidioc_try_ext_fmt>` ioctl logic for video
> + capture
> * @vidioc_try_fmt_vid_overlay: pointer to the function that implements
> * :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
> * @vidioc_try_fmt_vid_out: pointer to the function that implements
> * :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video out
> * in single plane mode
> + * @vidioc_try_ext_fmt_vid_out: pointer to the function that implements
> + * :ref:`VIDIOC_TRY_EXT_FMT <vidioc_g_fmt>` ioctl logic for video out
> * @vidioc_try_fmt_vid_out_overlay: pointer to the function that implements
> * :ref:`VIDIOC_TRY_FMT <vidioc_g_fmt>` ioctl logic for video overlay
> * output
> @@ -319,10 +334,14 @@ struct v4l2_ioctl_ops {
> /* VIDIOC_G_FMT handlers */
> int (*vidioc_g_fmt_vid_cap)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_g_ext_fmt_vid_cap)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_g_fmt_vid_out)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_g_ext_fmt_vid_out)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_g_fmt_vbi_cap)(struct file *file, void *fh,
> @@ -349,10 +368,14 @@ struct v4l2_ioctl_ops {
> /* VIDIOC_S_FMT handlers */
> int (*vidioc_s_fmt_vid_cap)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_s_ext_fmt_vid_cap)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_s_fmt_vid_out)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_s_ext_fmt_vid_out)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_s_fmt_vbi_cap)(struct file *file, void *fh,
> @@ -379,10 +402,14 @@ struct v4l2_ioctl_ops {
> /* VIDIOC_TRY_FMT handlers */
> int (*vidioc_try_fmt_vid_cap)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_try_ext_fmt_vid_cap)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_try_fmt_vid_out)(struct file *file, void *fh,
> struct v4l2_format *f);
> + int (*vidioc_try_ext_fmt_vid_out)(struct file *file, void *fh,
> + struct v4l2_ext_pix_format *f);
> int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
> struct v4l2_format *f);
> int (*vidioc_try_fmt_vbi_cap)(struct file *file, void *fh,
> @@ -722,4 +749,10 @@ long int video_usercopy(struct file *file, unsigned int cmd,
> long int video_ioctl2(struct file *file,
> unsigned int cmd, unsigned long int arg);
>
> +int v4l2_format_to_ext_format(const struct v4l2_format *f,
> + struct v4l2_ext_format *e, bool strict);
> +int v4l2_ext_format_to_format(const struct v4l2_ext_format *e,
> + struct v4l2_format *f,
> + bool mplane_cap, bool strict);
> +
> #endif /* _V4L2_IOCTL_H */
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 1db220da3bcc..b32c4a10c46f 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -2171,6 +2171,55 @@ struct v4l2_pix_format_mplane {
> __u8 reserved[7];
> } __attribute__ ((packed));
>
> +/**
> + * struct v4l2_plane_ext_pix_format - additional, per-plane format definition
> + * @sizeimage: maximum size in bytes required for data, for which
> + * this plane will be used
> + * @bytesperline: distance in bytes between the leftmost pixels in two
> + * adjacent lines
> + */
> +struct v4l2_plane_ext_pix_format {
> + __u32 sizeimage;
> + __u32 bytesperline;
> +};
> +
> +/**
> + * struct v4l2_ext_pix_format - extended single/multiplanar format definition
> + * @width: image width in pixels
> + * @height: image height in pixels
> + * @field: enum v4l2_field; field order (for interlaced video)
> + * @pixelformat: little endian four character code (fourcc)
> + * @modifier: modifier applied to the format (used for tiled formats and other
> + * kind of HW-specific formats, like compressed formats)
> + * @colorspace: enum v4l2_colorspace; supplemental to pixelformat
> + * @num_planes: number of planes for this format. Should be equal to 1
> + * for single-planar formats and greater than 1 for
> + * multiplanar ones
> + * @plane_fmt: per-plane information
> + * @flags: format flags (V4L2_PIX_FMT_FLAG_*)
> + * @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding
> + * @hsv_enc: enum v4l2_hsv_encoding, HSV encoding
> + * @quantization: enum v4l2_quantization, colorspace quantization
> + * @xfer_func: enum v4l2_xfer_func, colorspace transfer function
> + */
> +struct v4l2_ext_pix_format {
> + __u32 width;
> + __u32 height;
> + __u32 field;
> + __u32 pixelformat;
> + __u64 modifier;
> + __u32 colorspace;
> + __u32 num_planes;
> + struct v4l2_plane_ext_pix_format plane_fmt[VIDEO_MAX_PLANES];
> + __u8 flags;
> + union {
> + __u8 ycbcr_enc;
> + __u8 hsv_enc;
> + };
> + __u8 quantization;
> + __u8 xfer_func;
> +};
> +
> /**
> * struct v4l2_sdr_format - SDR format definition
> * @pixelformat: little endian four character code (fourcc)
> @@ -2216,6 +2265,35 @@ struct v4l2_format {
> } fmt;
> };
>
> +/**
> + * struct v4l2_ext_format - extended stream data format
> + * @type: enum v4l2_buf_type; type of the data stream.
> + * V4L2_BUF_TYPE_VIDEO[_OUTPUT]_OVERLAY and
> + * V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT}_MPLANE are not supported
> + * @pix: definition of an image format. Used for
> + * V4L2_BUF_TYPE_VIDEO_{CAPTURE,OUTPUT} types
> + * @vbi: raw VBI capture or output parameters. Used for
> + * V4L2_BUF_TYPE_VBI_{CAPTURE,OUTPUT} types
> + * @sliced: sliced VBI capture or output parameters. Used for
> + * V4L2_BUF_TYPE_SLICED_VBI_{CAPTURE,OUTPUT} types.
> + * @sdr: SDR capture or output parameters. Used for
> + * V4L2_BUF_TYPE_SDR_{CAPTURE,OUTPUT} types
> + * @meta: meta capture or output parameters. Used for
> + * V4L2_BUF_TYPE_META_{CAPTURE,OUTPUT} types
> + * @raw_data: placeholder for future extensions and custom formats
> + */
> +struct v4l2_ext_format {
> + __u32 type;
> + union {
> + struct v4l2_ext_pix_format pix;
> + struct v4l2_vbi_format vbi;
> + struct v4l2_sliced_vbi_format sliced;
> + struct v4l2_sdr_format sdr;
> + struct v4l2_meta_format meta;
> + __u8 raw_data[200];
> + } fmt;
> +};
> +
> /* Stream type-dependent parameters
> */
> struct v4l2_streamparm {
> @@ -2480,6 +2558,9 @@ struct v4l2_create_buffers {
>
> #define VIDIOC_QUERY_EXT_CTRL _IOWR('V', 103, struct v4l2_query_ext_ctrl)
>
> +#define VIDIOC_G_EXT_FMT _IOWR('V', 104, struct v4l2_ext_format)
> +#define VIDIOC_S_EXT_FMT _IOWR('V', 105, struct v4l2_ext_format)
> +#define VIDIOC_TRY_EXT_FMT _IOWR('V', 106, struct v4l2_ext_format)
> /* Reminder: when adding new ioctls please add support for them to
> drivers/media/v4l2-core/v4l2-compat-ioctl32.c as well! */
>
>
Regards,
Hans
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more)
2019-04-11 8:24 ` Hans Verkuil
@ 2019-04-11 8:37 ` Boris Brezillon
0 siblings, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-11 8:37 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On Thu, 11 Apr 2019 10:24:16 +0200
Hans Verkuil <hverkuil@xs4all.nl> wrote:
> > static void v4l_print_framebuffer(const void *arg, bool write_only)
> > {
> > const struct v4l2_framebuffer *p = arg;
> > @@ -951,11 +1027,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
> > switch (type) {
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > if ((is_vid || is_tch) && is_rx &&
> > - (ops->vidioc_g_fmt_vid_cap || ops->vidioc_g_fmt_vid_cap_mplane))
> > + (ops->vidioc_g_fmt_vid_cap ||
> > + ops->vidioc_g_ext_fmt_vid_cap ||
> > + ops->vidioc_g_fmt_vid_cap_mplane))
> > return 0;
> > break;
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> > - if (is_vid && is_rx && ops->vidioc_g_fmt_vid_cap_mplane)
> > + if (is_vid && is_rx &&
> > + (ops->vidioc_g_fmt_vid_cap_mplane ||
> > + ops->vidioc_g_ext_fmt_vid_cap))
>
> Is this right? I thought that V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE was to be refused
> when used with the new ioctls? Perhaps check_fmt needs an extra argument that
> tells it whether it is called from the new ioctls or not.
Or maybe we should do the format conversion (or just a type conversion)
before calling check_fmt().
>
> > return 0;
> > break;
> > case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> > @@ -964,11 +1044,15 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
> > break;
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> > if (is_vid && is_tx &&
> > - (ops->vidioc_g_fmt_vid_out || ops->vidioc_g_fmt_vid_out_mplane))
> > + (ops->vidioc_g_fmt_vid_out ||
> > + ops->vidioc_g_ext_fmt_vid_out ||
> > + ops->vidioc_g_fmt_vid_out_mplane))
> > return 0;
> > break;
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> > - if (is_vid && is_tx && ops->vidioc_g_fmt_vid_out_mplane)
> > + if (is_vid && is_tx &&
> > + (ops->vidioc_g_ext_fmt_vid_out ||
> > + ops->vidioc_g_fmt_vid_out_mplane))
> > return 0;
> > break;
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> > @@ -1048,6 +1132,197 @@ static void v4l_sanitize_format(struct v4l2_format *fmt)
> > sizeof(fmt->fmt.pix) - offset);
> > }
> > +static int v4l_g_fmt_ext_pix(const struct v4l2_ioctl_ops *ops,
> > + struct file *file, void *fh,
> > + struct v4l2_format *f)
> > +{
> > + struct v4l2_ext_format ef = {
> > + .type = f->type,
> > + };
> > + int ret;
> > +
> > + switch (f->type) {
> > + case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> > + ret = ops->vidioc_g_ext_fmt_vid_cap(file, fh, &ef.fmt.pix);
>
> This will call vidioc_g_ext_fmt_vid_cap with type _MPLANE, which we said we
> wouldn't support for the extended ioctls.
That's okay because we don't pass ef around just the ef.fmt.pix
which does not contain the format type. This being said, we should
definitely have
ef.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
for the v4l2_ext_format_to_format() conversion that happens at the end
of the function.
>
> > + break;
> > +
> > + case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> > + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
Same here:
ef.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> > + ret = ops->vidioc_g_ext_fmt_vid_out(file, fh, &ef.fmt.pix);
> > + break;
> > +
> > + default:
> > + return -EINVAL;
> > + }
> > +
> > + if (ret)
> > + return ret;
> > +
> > + return v4l2_ext_format_to_format(&ef, f,
> > + V4L2_TYPE_IS_MULTIPLANAR(f->type),
> > + true);
> > +}
> > +
> > static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> > struct file *file, void *fh, void *arg)
> > {
> > @@ -1475,15 +1782,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> >
> > switch (p->type) {
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > - if (unlikely(!ops->vidioc_g_fmt_vid_cap))
> > - break;
> > - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > - ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
> > - /* just in case the driver zeroed it again */
> > - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > - return ret;
> > + if (ops->vidioc_g_fmt_vid_cap) {
> > + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + ret = ops->vidioc_g_fmt_vid_cap(file, fh, arg);
> > + /* just in case the driver zeroed it again */
> > + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + return ret;
> > + } else if (ops->vidioc_g_ext_fmt_vid_cap) {
> > + return v4l_g_fmt_ext_pix(ops, file, fh, p);
>
> Test for the extended op first. Same elsewhere below. E.g.:
>
> if (ops->vidioc_g_ext_fmt_vid_cap)
> return v4l_g_fmt_ext_pix(ops, file, fh, p);
> if (unlikely(!ops->vidioc_g_fmt_vid_cap))
> break;
> p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> ...
Sure, I'll change the order.
>
> > + }
> > + break;
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> > - return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
> > + if (ops->vidioc_g_fmt_vid_cap_mplane)
> > + return ops->vidioc_g_fmt_vid_cap_mplane(file, fh, arg);
> > + else if (ops->vidioc_g_ext_fmt_vid_cap)
> > + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> > + break;
> > case V4L2_BUF_TYPE_VIDEO_OVERLAY:
> > return ops->vidioc_g_fmt_vid_overlay(file, fh, arg);
> > case V4L2_BUF_TYPE_VBI_CAPTURE:
> > @@ -1491,15 +1805,22 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
> > case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
> > return ops->vidioc_g_fmt_sliced_vbi_cap(file, fh, arg);
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT:
> > - if (unlikely(!ops->vidioc_g_fmt_vid_out))
> > - break;
> > - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > - ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
> > - /* just in case the driver zeroed it again */
> > - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > - return ret;
> > + if (ops->vidioc_g_fmt_vid_out) {
> > + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + ret = ops->vidioc_g_fmt_vid_out(file, fh, arg);
> > + /* just in case the driver zeroed it again */
> > + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + return ret;
> > + } else if (ops->vidioc_g_ext_fmt_vid_out) {
> > + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> > + }
> > + break;
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> > - return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
> > + if (ops->vidioc_g_fmt_vid_out_mplane)
> > + return ops->vidioc_g_fmt_vid_out_mplane(file, fh, arg);
> > + else if (ops->vidioc_g_ext_fmt_vid_out)
> > + return v4l_g_fmt_ext_pix(ops, file, fh, p);
> > + break;
> > case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:
> > return ops->vidioc_g_fmt_vid_out_overlay(file, fh, arg);
> > case V4L2_BUF_TYPE_VBI_OUTPUT:
> > static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> > struct file *file, void *fh, void *arg)
> > {
> > @@ -1551,23 +1943,31 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
> >
> > switch (p->type) {
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > - if (unlikely(!ops->vidioc_s_fmt_vid_cap))
> > - break;
> > - CLEAR_AFTER_FIELD(p, fmt.pix);
> > - ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
> > - /* just in case the driver zeroed it again */
> > - p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + if (ops->vidioc_s_fmt_vid_cap) {
> > + CLEAR_AFTER_FIELD(p, fmt.pix);
> > + ret = ops->vidioc_s_fmt_vid_cap(file, fh, arg);
> > + /* just in case the driver zeroed it again */
> > + p->fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC;
> > + } else if (ops->vidioc_s_ext_fmt_vid_cap) {
> > + ret = v4l_s_fmt_ext_pix(ops, file, fh, arg);
>
> The helper functions v4l_[g/s/try]_fmt_ext_pix are confusingly named.
> How about: v4l_[g/s/try]_fmt_using_ext_fmt.
Yep, that's definitely a better name.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-11 7:59 ` Hans Verkuil
@ 2019-04-11 10:36 ` Boris Brezillon
2019-04-11 10:38 ` Hans Verkuil
0 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-04-11 10:36 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On Thu, 11 Apr 2019 09:59:19 +0200
Hans Verkuil <hverkuil@xs4all.nl> wrote:
> On 4/4/19 10:16 AM, Boris Brezillon wrote:
> > Support for multiplanar and singleplanar formats is mutually exclusive,
> > at least in practice. In our attempt to unify support for support for
> > mplane and !mplane in v4l, let's get rid of the
> > ->vidioc_enum_fmt_{vid,out}_cap_mplane() hooks and call
> > ->vidioc_enum_fmt_{vid,out}_cap() instead.
>
> This is a good idea. This can be done separately from the other patches in
> this series and merged.
Sure, I'll send this patch separately.
>
> One comment...
>
> >
> > Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> > ---
> > Changes in v2:
> > - None
> > ---
> > drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
> > drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 ++--
> > .../media/platform/exynos4-is/fimc-capture.c | 2 +-
> > .../platform/exynos4-is/fimc-isp-video.c | 2 +-
> > drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> > drivers/media/platform/exynos4-is/fimc-m2m.c | 4 ++--
> > .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
> > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 ++--
> > .../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++--
> > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 ++--
> > .../media/platform/qcom/camss/camss-video.c | 2 +-
> > drivers/media/platform/qcom/venus/vdec.c | 4 ++--
> > drivers/media/platform/qcom/venus/venc.c | 4 ++--
> > drivers/media/platform/rcar_fdp1.c | 4 ++--
> > drivers/media/platform/rcar_jpu.c | 4 ++--
> > drivers/media/platform/renesas-ceu.c | 2 +-
> > drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 ++--
> > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 ++--
> > drivers/media/platform/ti-vpe/vpe.c | 4 ++--
> > drivers/media/platform/vicodec/vicodec-core.c | 2 --
> > drivers/media/platform/vivid/vivid-core.c | 6 ++----
> > .../media/platform/vivid/vivid-vid-common.c | 20 ------------------
> > .../media/platform/vivid/vivid-vid-common.h | 2 --
> > drivers/media/v4l2-core/v4l2-dev.c | 2 --
> > drivers/media/v4l2-core/v4l2-ioctl.c | 21 ++++++++++---------
> > drivers/staging/media/ipu3/ipu3-v4l2.c | 4 ++--
> > .../media/rockchip/vpu/rockchip_vpu_enc.c | 4 ++--
> > include/media/v4l2-ioctl.h | 14 ++-----------
> > 28 files changed, 51 insertions(+), 88 deletions(-)
> >
> > diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> > index f8020ebe9f05..c3b3af3c3b2f 100644
> > --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> > +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
> > @@ -1174,7 +1174,7 @@ static const struct v4l2_file_operations cio2_v4l2_fops = {
> >
> > static const struct v4l2_ioctl_ops cio2_v4l2_ioctl_ops = {
> > .vidioc_querycap = cio2_v4l2_querycap,
> > - .vidioc_enum_fmt_vid_cap_mplane = cio2_v4l2_enum_fmt,
> > + .vidioc_enum_fmt_vid_cap = cio2_v4l2_enum_fmt,
> > .vidioc_g_fmt_vid_cap_mplane = cio2_v4l2_g_fmt,
> > .vidioc_s_fmt_vid_cap_mplane = cio2_v4l2_s_fmt,
> > .vidioc_try_fmt_vid_cap_mplane = cio2_v4l2_try_fmt,
> > diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> > index c757f5d98bcc..9e2914d3d8f9 100644
> > --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
> > +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> > @@ -562,8 +562,8 @@ static int gsc_m2m_s_selection(struct file *file, void *fh,
> >
> > static const struct v4l2_ioctl_ops gsc_m2m_ioctl_ops = {
> > .vidioc_querycap = gsc_m2m_querycap,
> > - .vidioc_enum_fmt_vid_cap_mplane = gsc_m2m_enum_fmt_mplane,
> > - .vidioc_enum_fmt_vid_out_mplane = gsc_m2m_enum_fmt_mplane,
> > + .vidioc_enum_fmt_vid_cap = gsc_m2m_enum_fmt_mplane,
> > + .vidioc_enum_fmt_vid_out = gsc_m2m_enum_fmt_mplane,
>
> Please rename the functions as well, dropping the _mplane suffix. Here and in
> the other drivers.
>
Okay, I'm remove those _mplane suffix.
> > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> > index f6d663934648..97ba365218fb 100644
> > --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> > @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
> > static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> > struct file *file, void *fh, void *arg)
> > {
> > + struct video_device *vdev = video_devdata(file);
> > struct v4l2_fmtdesc *p = arg;
> > int ret = check_fmt(file, p->type);
> >
> > @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> >
> > switch (p->type) {
> > case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> > + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
>
> Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
> fill in vdev->device_caps. While filling in vdev->device_caps is required for
> new drivers, older drivers often don't do this.
>
> You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
> to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
> drivers don't fill this in.
I'll check that and fix those that don't set the flag. Or do you have
another solution to handle that case?
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-11 10:36 ` Boris Brezillon
@ 2019-04-11 10:38 ` Hans Verkuil
2019-04-12 8:25 ` Boris Brezillon
0 siblings, 1 reply; 25+ messages in thread
From: Hans Verkuil @ 2019-04-11 10:38 UTC (permalink / raw)
To: Boris Brezillon
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On 4/11/19 12:36 PM, Boris Brezillon wrote:
> On Thu, 11 Apr 2019 09:59:19 +0200
> Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
>> On 4/4/19 10:16 AM, Boris Brezillon wrote:
>>> Support for multiplanar and singleplanar formats is mutually exclusive,
>>> at least in practice. In our attempt to unify support for support for
>>> mplane and !mplane in v4l, let's get rid of the
>>> ->vidioc_enum_fmt_{vid,out}_cap_mplane() hooks and call
>>> ->vidioc_enum_fmt_{vid,out}_cap() instead.
>>
>> This is a good idea. This can be done separately from the other patches in
>> this series and merged.
>
> Sure, I'll send this patch separately.
>
>>
>> One comment...
>>
>>>
>>> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
>>> ---
>>> Changes in v2:
>>> - None
>>> ---
>>> drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
>>> drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 ++--
>>> .../media/platform/exynos4-is/fimc-capture.c | 2 +-
>>> .../platform/exynos4-is/fimc-isp-video.c | 2 +-
>>> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
>>> drivers/media/platform/exynos4-is/fimc-m2m.c | 4 ++--
>>> .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
>>> drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 ++--
>>> .../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++--
>>> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 ++--
>>> .../media/platform/qcom/camss/camss-video.c | 2 +-
>>> drivers/media/platform/qcom/venus/vdec.c | 4 ++--
>>> drivers/media/platform/qcom/venus/venc.c | 4 ++--
>>> drivers/media/platform/rcar_fdp1.c | 4 ++--
>>> drivers/media/platform/rcar_jpu.c | 4 ++--
>>> drivers/media/platform/renesas-ceu.c | 2 +-
>>> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 ++--
>>> drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 ++--
>>> drivers/media/platform/ti-vpe/vpe.c | 4 ++--
>>> drivers/media/platform/vicodec/vicodec-core.c | 2 --
>>> drivers/media/platform/vivid/vivid-core.c | 6 ++----
>>> .../media/platform/vivid/vivid-vid-common.c | 20 ------------------
>>> .../media/platform/vivid/vivid-vid-common.h | 2 --
>>> drivers/media/v4l2-core/v4l2-dev.c | 2 --
>>> drivers/media/v4l2-core/v4l2-ioctl.c | 21 ++++++++++---------
>>> drivers/staging/media/ipu3/ipu3-v4l2.c | 4 ++--
>>> .../media/rockchip/vpu/rockchip_vpu_enc.c | 4 ++--
>>> include/media/v4l2-ioctl.h | 14 ++-----------
>>> 28 files changed, 51 insertions(+), 88 deletions(-)
>>>
>>> diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>>> index f8020ebe9f05..c3b3af3c3b2f 100644
>>> --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>>> +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
>>> @@ -1174,7 +1174,7 @@ static const struct v4l2_file_operations cio2_v4l2_fops = {
>>>
>>> static const struct v4l2_ioctl_ops cio2_v4l2_ioctl_ops = {
>>> .vidioc_querycap = cio2_v4l2_querycap,
>>> - .vidioc_enum_fmt_vid_cap_mplane = cio2_v4l2_enum_fmt,
>>> + .vidioc_enum_fmt_vid_cap = cio2_v4l2_enum_fmt,
>>> .vidioc_g_fmt_vid_cap_mplane = cio2_v4l2_g_fmt,
>>> .vidioc_s_fmt_vid_cap_mplane = cio2_v4l2_s_fmt,
>>> .vidioc_try_fmt_vid_cap_mplane = cio2_v4l2_try_fmt,
>>> diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
>>> index c757f5d98bcc..9e2914d3d8f9 100644
>>> --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
>>> +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
>>> @@ -562,8 +562,8 @@ static int gsc_m2m_s_selection(struct file *file, void *fh,
>>>
>>> static const struct v4l2_ioctl_ops gsc_m2m_ioctl_ops = {
>>> .vidioc_querycap = gsc_m2m_querycap,
>>> - .vidioc_enum_fmt_vid_cap_mplane = gsc_m2m_enum_fmt_mplane,
>>> - .vidioc_enum_fmt_vid_out_mplane = gsc_m2m_enum_fmt_mplane,
>>> + .vidioc_enum_fmt_vid_cap = gsc_m2m_enum_fmt_mplane,
>>> + .vidioc_enum_fmt_vid_out = gsc_m2m_enum_fmt_mplane,
>>
>> Please rename the functions as well, dropping the _mplane suffix. Here and in
>> the other drivers.
>>
>
> Okay, I'm remove those _mplane suffix.
>
>>> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
>>> index f6d663934648..97ba365218fb 100644
>>> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
>>> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
>>> @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
>>> static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
>>> struct file *file, void *fh, void *arg)
>>> {
>>> + struct video_device *vdev = video_devdata(file);
>>> struct v4l2_fmtdesc *p = arg;
>>> int ret = check_fmt(file, p->type);
>>>
>>> @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
>>>
>>> switch (p->type) {
>>> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>>> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>>> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
>>
>> Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
>> fill in vdev->device_caps. While filling in vdev->device_caps is required for
>> new drivers, older drivers often don't do this.
>>
>> You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
>> to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
>> drivers don't fill this in.
>
> I'll check that and fix those that don't set the flag. Or do you have
> another solution to handle that case?
>
There might be other solutions as well, but regardless of that it would be a very
good idea for other reasons as well if all MPLANE drivers would fill in vdev->device_caps.
Regards,
Hans
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-11 10:38 ` Hans Verkuil
@ 2019-04-12 8:25 ` Boris Brezillon
2019-04-12 8:33 ` Boris Brezillon
2019-04-12 9:36 ` Hans Verkuil
0 siblings, 2 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-12 8:25 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On Thu, 11 Apr 2019 12:38:06 +0200
Hans Verkuil <hverkuil@xs4all.nl> wrote:
> >>> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> >>> index f6d663934648..97ba365218fb 100644
> >>> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> >>> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> >>> @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
> >>> static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> >>> struct file *file, void *fh, void *arg)
> >>> {
> >>> + struct video_device *vdev = video_devdata(file);
> >>> struct v4l2_fmtdesc *p = arg;
> >>> int ret = check_fmt(file, p->type);
> >>>
> >>> @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> >>>
> >>> switch (p->type) {
> >>> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> >>> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> >>> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
> >>
> >> Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
> >> fill in vdev->device_caps. While filling in vdev->device_caps is required for
> >> new drivers, older drivers often don't do this.
> >>
> >> You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
> >> to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
> >> drivers don't fill this in.
> >
> > I'll check that and fix those that don't set the flag. Or do you have
> > another solution to handle that case?
> >
>
> There might be other solutions as well, but regardless of that it would be a very
> good idea for other reasons as well if all MPLANE drivers would fill in vdev->device_caps.
Looks like all drivers except fimc-isp-video.c have the _MPLANE caps
properly set/reported.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-12 8:25 ` Boris Brezillon
@ 2019-04-12 8:33 ` Boris Brezillon
2019-04-12 9:36 ` Hans Verkuil
1 sibling, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-04-12 8:33 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On Fri, 12 Apr 2019 10:25:26 +0200
Boris Brezillon <boris.brezillon@collabora.com> wrote:
> On Thu, 11 Apr 2019 12:38:06 +0200
> Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> > >>> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> > >>> index f6d663934648..97ba365218fb 100644
> > >>> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> > >>> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> > >>> @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
> > >>> static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> > >>> struct file *file, void *fh, void *arg)
> > >>> {
> > >>> + struct video_device *vdev = video_devdata(file);
> > >>> struct v4l2_fmtdesc *p = arg;
> > >>> int ret = check_fmt(file, p->type);
> > >>>
> > >>> @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
> > >>>
> > >>> switch (p->type) {
> > >>> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> > >>> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> > >>> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
> > >>
> > >> Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
> > >> fill in vdev->device_caps. While filling in vdev->device_caps is required for
> > >> new drivers, older drivers often don't do this.
> > >>
> > >> You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
> > >> to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
> > >> drivers don't fill this in.
> > >
> > > I'll check that and fix those that don't set the flag. Or do you have
> > > another solution to handle that case?
> > >
> >
> > There might be other solutions as well, but regardless of that it would be a very
> > good idea for other reasons as well if all MPLANE drivers would fill in vdev->device_caps.
>
> Looks like all drivers except fimc-isp-video.c have the _MPLANE caps
> properly set/reported.
Oh, and fimc-lite too.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations
2019-04-04 8:16 ` [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations Boris Brezillon
@ 2019-04-12 8:57 ` Boris Brezillon
2019-05-08 13:58 ` Hans Verkuil
0 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-04-12 8:57 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa
Cc: Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
On Thu, 4 Apr 2019 10:16:56 +0200
Boris Brezillon <boris.brezillon@collabora.com> wrote:
> +/**
> + * struct v4l2_ext_buffer - extended video buffer info
> + * @index: id number of the buffer
> + * @type: enum v4l2_buf_type; buffer type. _MPLANE and _OVERLAY formats are
> + * invalid
> + * @flags: buffer informational flags
> + * @field: enum v4l2_field; field order of the image in the buffer
> + * @timestamp: frame timestamp
> + * @sequence: sequence count of this frame
> + * @memory: enum v4l2_memory; the method, in which the actual video data is
> + * passed
> + * @planes: per-plane buffer information
> + * @num_planes: number of plane buffers
> + * @request_fd: fd of the request that this buffer should use
> + * @reserved: some extra space reserved to add future fields (like timecode).
> + * Must be set to 0
> + *
> + * Contains data exchanged by application and driver using one of the Streaming
> + * I/O methods.
> + */
> +struct v4l2_ext_buffer {
> + __u32 index;
> + __u32 type;
> + __u32 flags;
> + __u32 field;
> + __u64 timestamp;
> + __u32 sequence;
> + __u32 memory;
> + struct v4l2_ext_plane planes[VIDEO_MAX_PLANES];
I had a discussion with Tomasz last week, and he made me realize I was
misunderstanding the concept of V4L2 planes. I thought it was encoding
pixel-component planes, but it's actually memory planes, and sometimes
those one memory planes might contain all component planes placed next
to each others (like the V4L2_PIX_FMT_NV12 format).
So, the question is, what do we want v4l2_ext_plane to encode (memory
planes or pixel component planes)?
If we go for the pixel component plane approach (which IMHO would be a
good thing), that means we'll have to convert V4L2_PIX_FMT_NV12-like
single-memory-plane buffers into v4l2_ext_buffer containing X planes,
each pointing to the same memory object but at a different offset.
> + __u32 num_planes;
> + __u32 request_fd;
> + __u32 reserved[10];
> +};
> +
> /**
> * v4l2_timeval_to_ns - Convert timeval to nanoseconds
> * @ts: pointer to the timeval variable to be converted
> @@ -1062,6 +1139,35 @@ struct v4l2_exportbuffer {
> __u32 reserved[11];
> };
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
2019-04-12 8:25 ` Boris Brezillon
2019-04-12 8:33 ` Boris Brezillon
@ 2019-04-12 9:36 ` Hans Verkuil
1 sibling, 0 replies; 25+ messages in thread
From: Hans Verkuil @ 2019-04-12 9:36 UTC (permalink / raw)
To: Boris Brezillon
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On 4/12/19 10:25 AM, Boris Brezillon wrote:
> On Thu, 11 Apr 2019 12:38:06 +0200
> Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
>>>>> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
>>>>> index f6d663934648..97ba365218fb 100644
>>>>> --- a/drivers/media/v4l2-core/v4l2-ioctl.c
>>>>> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
>>>>> @@ -1380,6 +1380,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
>>>>> static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
>>>>> struct file *file, void *fh, void *arg)
>>>>> {
>>>>> + struct video_device *vdev = video_devdata(file);
>>>>> struct v4l2_fmtdesc *p = arg;
>>>>> int ret = check_fmt(file, p->type);
>>>>>
>>>>> @@ -1389,30 +1390,30 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
>>>>>
>>>>> switch (p->type) {
>>>>> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
>>>>> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
>>>>> + if (!!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) !=
>>>>
>>>> Hmm. I am not sure if all drivers that set V4L2_CAP_VIDEO_CAPTURE_MPLANE also
>>>> fill in vdev->device_caps. While filling in vdev->device_caps is required for
>>>> new drivers, older drivers often don't do this.
>>>>
>>>> You would have to check all drivers that set V4L2_CAP_VIDEO_CAPTURE/OUTPUT_MPLANE
>>>> to verify that they also set vdev->device_caps. I'm fairly certain the Samsung
>>>> drivers don't fill this in.
>>>
>>> I'll check that and fix those that don't set the flag. Or do you have
>>> another solution to handle that case?
>>>
>>
>> There might be other solutions as well, but regardless of that it would be a very
>> good idea for other reasons as well if all MPLANE drivers would fill in vdev->device_caps.
>
> Looks like all drivers except fimc-isp-video.c have the _MPLANE caps
> properly set/reported.
>
That's not enough, they need to fill in vdev->device_caps as well. I.e., they shouldn't
fill in device_caps and capabilities in their querycap implementation, instead they
should just set device_caps in the struct video_device. That way the V4L2 core will
know the video device capabilities since it is now stored in an internal structure.
Regards,
Hans
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations
2019-04-12 8:57 ` Boris Brezillon
@ 2019-05-08 13:58 ` Hans Verkuil
2019-05-16 8:23 ` Tomasz Figa
0 siblings, 1 reply; 25+ messages in thread
From: Hans Verkuil @ 2019-05-08 13:58 UTC (permalink / raw)
To: Boris Brezillon, Mauro Carvalho Chehab, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, linux-media, Tomasz Figa
Cc: Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
Hi Boris,
On 4/12/19 10:57 AM, Boris Brezillon wrote:
> On Thu, 4 Apr 2019 10:16:56 +0200
> Boris Brezillon <boris.brezillon@collabora.com> wrote:
>
>
>> +/**
>> + * struct v4l2_ext_buffer - extended video buffer info
>> + * @index: id number of the buffer
>> + * @type: enum v4l2_buf_type; buffer type. _MPLANE and _OVERLAY formats are
>> + * invalid
>> + * @flags: buffer informational flags
>> + * @field: enum v4l2_field; field order of the image in the buffer
>> + * @timestamp: frame timestamp
>> + * @sequence: sequence count of this frame
>> + * @memory: enum v4l2_memory; the method, in which the actual video data is
>> + * passed
>> + * @planes: per-plane buffer information
>> + * @num_planes: number of plane buffers
>> + * @request_fd: fd of the request that this buffer should use
>> + * @reserved: some extra space reserved to add future fields (like timecode).
>> + * Must be set to 0
>> + *
>> + * Contains data exchanged by application and driver using one of the Streaming
>> + * I/O methods.
>> + */
>> +struct v4l2_ext_buffer {
>> + __u32 index;
>> + __u32 type;
>> + __u32 flags;
>> + __u32 field;
>> + __u64 timestamp;
>> + __u32 sequence;
>> + __u32 memory;
>> + struct v4l2_ext_plane planes[VIDEO_MAX_PLANES];
>
> I had a discussion with Tomasz last week, and he made me realize I was
> misunderstanding the concept of V4L2 planes. I thought it was encoding
> pixel-component planes, but it's actually memory planes, and sometimes
> those one memory planes might contain all component planes placed next
> to each others (like the V4L2_PIX_FMT_NV12 format).
>
> So, the question is, what do we want v4l2_ext_plane to encode (memory
> planes or pixel component planes)?
> If we go for the pixel component plane approach (which IMHO would be a
> good thing), that means we'll have to convert V4L2_PIX_FMT_NV12-like
> single-memory-plane buffers into v4l2_ext_buffer containing X planes,
> each pointing to the same memory object but at a different offset.
First of all my apologies for the long delay in replying.
I think v4l2_ext_plane should encode pixel component planes, that way
it becomes much easier to describe e.g. NV12 formats that use a single
memory range, but where each component plane has its own bytesperline
value and where each component plane starts at e.g. a page boundary
due to hardware restrictions.
This is currently impossible to describe without creating a new pixel
format.
But it is of course possible that different component planes use
different memory ranges.
I think that the memory information in v4l2_ext_plane should describe the
memory for that component plane and any following component planes that
are part of that memory. The memory information for those following
component planes should be 0 or some other value that makes it clear
that it is part of the same memory buffer as the preceding component plane.
Regards,
Hans
>
>> + __u32 num_planes;
>> + __u32 request_fd;
>> + __u32 reserved[10];
>> +};
>> +
>> /**
>> * v4l2_timeval_to_ns - Convert timeval to nanoseconds
>> * @ts: pointer to the timeval variable to be converted
>> @@ -1062,6 +1139,35 @@ struct v4l2_exportbuffer {
>> __u32 reserved[11];
>> };
>>
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations
2019-05-08 13:58 ` Hans Verkuil
@ 2019-05-16 8:23 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2019-05-16 8:23 UTC (permalink / raw)
To: Hans Verkuil
Cc: Boris Brezillon, Mauro Carvalho Chehab, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, Linux Media Mailing List,
Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
On Wed, May 8, 2019 at 10:58 PM Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> Hi Boris,
>
> On 4/12/19 10:57 AM, Boris Brezillon wrote:
> > On Thu, 4 Apr 2019 10:16:56 +0200
> > Boris Brezillon <boris.brezillon@collabora.com> wrote:
> >
> >
> >> +/**
> >> + * struct v4l2_ext_buffer - extended video buffer info
> >> + * @index: id number of the buffer
> >> + * @type: enum v4l2_buf_type; buffer type. _MPLANE and _OVERLAY formats are
> >> + * invalid
> >> + * @flags: buffer informational flags
> >> + * @field: enum v4l2_field; field order of the image in the buffer
> >> + * @timestamp: frame timestamp
> >> + * @sequence: sequence count of this frame
> >> + * @memory: enum v4l2_memory; the method, in which the actual video data is
> >> + * passed
> >> + * @planes: per-plane buffer information
> >> + * @num_planes: number of plane buffers
> >> + * @request_fd: fd of the request that this buffer should use
> >> + * @reserved: some extra space reserved to add future fields (like timecode).
> >> + * Must be set to 0
> >> + *
> >> + * Contains data exchanged by application and driver using one of the Streaming
> >> + * I/O methods.
> >> + */
> >> +struct v4l2_ext_buffer {
> >> + __u32 index;
> >> + __u32 type;
> >> + __u32 flags;
> >> + __u32 field;
> >> + __u64 timestamp;
> >> + __u32 sequence;
> >> + __u32 memory;
> >> + struct v4l2_ext_plane planes[VIDEO_MAX_PLANES];
> >
> > I had a discussion with Tomasz last week, and he made me realize I was
> > misunderstanding the concept of V4L2 planes. I thought it was encoding
> > pixel-component planes, but it's actually memory planes, and sometimes
> > those one memory planes might contain all component planes placed next
> > to each others (like the V4L2_PIX_FMT_NV12 format).
> >
> > So, the question is, what do we want v4l2_ext_plane to encode (memory
> > planes or pixel component planes)?
> > If we go for the pixel component plane approach (which IMHO would be a
> > good thing), that means we'll have to convert V4L2_PIX_FMT_NV12-like
> > single-memory-plane buffers into v4l2_ext_buffer containing X planes,
> > each pointing to the same memory object but at a different offset.
>
> First of all my apologies for the long delay in replying.
>
> I think v4l2_ext_plane should encode pixel component planes, that way
> it becomes much easier to describe e.g. NV12 formats that use a single
> memory range, but where each component plane has its own bytesperline
> value and where each component plane starts at e.g. a page boundary
> due to hardware restrictions.
>
> This is currently impossible to describe without creating a new pixel
> format.
Agreed with the above.
>
> But it is of course possible that different component planes use
> different memory ranges.
>
> I think that the memory information in v4l2_ext_plane should describe the
> memory for that component plane and any following component planes that
> are part of that memory. The memory information for those following
> component planes should be 0 or some other value that makes it clear
> that it is part of the same memory buffer as the preceding component plane.
That could be an option too, but there are also cases where the
userspace has no idea to know if all the memory buffers are the same,
e.g. when it gets dup()ed DMA-buf FDs for all the color planes.
We should let the userspace set file descriptors for all the color
planes and then the framework figure out if that matches the driver
(or format) expectations.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
` (6 preceding siblings ...)
2019-04-04 8:17 ` [RFC PATCH v2 7/7] media: vimc: Implement the ext_fmt and ext_buf hooks Boris Brezillon
@ 2019-09-23 11:41 ` Hans Verkuil
2019-09-23 14:40 ` Boris Brezillon
7 siblings, 1 reply; 25+ messages in thread
From: Hans Verkuil @ 2019-09-23 11:41 UTC (permalink / raw)
To: Boris Brezillon, Mauro Carvalho Chehab, Hans Verkuil,
Laurent Pinchart, Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
Hi Boris,
On 4/4/19 10:16 AM, Boris Brezillon wrote:
> Hello,
>
> This RFC follows the discussion started by Hans [1] a few months back.
> It does not try to address all the problem reported in this thread but
> instead focuses on the FMT and BUF(S) ioctls.
>
> Note that my primary goal is to unify handling for multiplanar and
> singleplanar formats and extend things to support the "single dmabuf
> storing all pixel planes" issue.
>
> This version received a bit more testing than the previous one (added
> new tests to v4l2-compliance [2] to make sure EXT ioctls work as
> expected and also checked that !ext -> ext wrappers work correctly by
> running the old tests). Note that I'm not planning to post those
> v4l-utils patches on the ML until we've settled down on the userspace
> API, unless I'm explicitly asked to do so.
>
> Right now I'm focusing on the case I was primarily interested in:
> single dmabuf storing all pixel planes (each being at a different
> offset), and it seems that patching the VB2 core to support that is
> not a trivial task.
>
> So here are a few questions for V4L/DMABUF experts:
> - Can the same dmabuf be mapped several times. I think it's okay apart
> from the extra/needless time spent doing cache maintenance
> operations, but there might be issues if an IOMMU is involved
> (duplicate mappings?). If it's not okay, then we need to find a
> solution to only attach/map the DMABUF once when it's used for
> several planes (this is what I tried to do here [3], but I'm not
> entirely happy with the implementation and started to investigate
> another approach here [4]).
> - How should we pass the offset to drivers that were previously using
> the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
> Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
> case can be done in the core, but for an sg-table it's a bit more
> complicated. Should drivers access this piece of information
> directly from vb2_plane->dbuf_offset? And in that case, how do we
> make sure drivers don't simply ignore the offset and assume it's
> always zero?
>
> Few words about the feedback I got from Brian and Nicolas on my v1:
>
> - modifier field has been moved to v4l2_ext_format as suggested
> - v4l2_timecode is still not present in v4l2_ext_buffer, but can be
> added back thanks to the extra reserved space
> - the ENUMFMT is left as is for now, because I think we want Maxime's
> work on DRM/V4L format unification to land before reworking the
> ioctl (exposing extra info about the format and not only the 4CC
> code?). That also means that there's currently no way to know which
> modifiers are supported
> - EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
> supported or not have not been added yet
Can you post a v3, rebased on top of our current master branch? No other
changes needed, just a rebase.
I want to discuss this series during the media summit in Lyon and this
one is getting a bit old. Also, the new patchwork is much better at
keeping patch series together, so that makes it handy to link to this
series.
Regards,
Hans
>
> Regards,
>
> Boris
>
> [1]https://www.mail-archive.com/linux-media@vger.kernel.org/msg135729.html
> [2]https://github.com/bbrezillon/v4l-utils/commits/master
> [3]https://github.com/bbrezillon/linux/commit/4882435f80b05a61827649d55cc0f0cee79680a7
> [4]https://github.com/bbrezillon/linux/commit/a415216c6aaab2d51f0bd62270b994c8196ddd90
>
> *** BLURB HERE ***
>
> Boris Brezillon (6):
> media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
> media: v4l2: Extend pixel formats to unify single/multi-planar
> handling (and more)
> media: videobuf2: Expose helpers to implement the _ext_fmt and
> _ext_buf hooks
> media: mediabus: Add an helper to convert a ext_pix format to an
> mbus_fmt
> media: vivid: Convert the capture and output drivers to
> EXT_FMT/EXT_BUF
> media: vimc: Implement the ext_fmt and ext_buf hooks
>
> Hans Verkuil (1):
> media: v4l2: Add extended buffer operations
>
> .../media/common/videobuf2/videobuf2-core.c | 2 +
> .../media/common/videobuf2/videobuf2-v4l2.c | 534 +++++---
> drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
> drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
> .../media/platform/exynos4-is/fimc-capture.c | 2 +-
> .../platform/exynos4-is/fimc-isp-video.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-m2m.c | 4 +-
> .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +-
> drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 +-
> .../platform/mtk-vcodec/mtk_vcodec_dec.c | 4 +-
> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 4 +-
> .../media/platform/qcom/camss/camss-video.c | 2 +-
> drivers/media/platform/qcom/venus/vdec.c | 4 +-
> drivers/media/platform/qcom/venus/venc.c | 4 +-
> drivers/media/platform/rcar_fdp1.c | 4 +-
> drivers/media/platform/rcar_jpu.c | 4 +-
> drivers/media/platform/renesas-ceu.c | 2 +-
> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 +-
> drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 +-
> drivers/media/platform/ti-vpe/vpe.c | 4 +-
> drivers/media/platform/vicodec/vicodec-core.c | 2 -
> drivers/media/platform/vimc/vimc-capture.c | 65 +-
> drivers/media/platform/vimc/vimc-common.c | 4 +-
> drivers/media/platform/vimc/vimc-common.h | 2 +-
> drivers/media/platform/vimc/vimc-core.c | 10 +-
> drivers/media/platform/vivid/vivid-core.c | 36 +-
> drivers/media/platform/vivid/vivid-vid-cap.c | 171 +--
> drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
> .../media/platform/vivid/vivid-vid-common.c | 20 -
> .../media/platform/vivid/vivid-vid-common.h | 2 -
> drivers/media/platform/vivid/vivid-vid-out.c | 195 +--
> drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
> drivers/media/v4l2-core/v4l2-dev.c | 56 +-
> drivers/media/v4l2-core/v4l2-ioctl.c | 1141 +++++++++++++++--
> drivers/staging/media/ipu3/ipu3-v4l2.c | 4 +-
> .../media/rockchip/vpu/rockchip_vpu_enc.c | 4 +-
> include/media/v4l2-ioctl.h | 77 +-
> include/media/v4l2-mediabus.h | 22 +
> include/media/videobuf2-core.h | 6 +-
> include/media/videobuf2-v4l2.h | 26 +-
> include/uapi/linux/videodev2.h | 211 +++
> 42 files changed, 1945 insertions(+), 739 deletions(-)
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
2019-09-23 11:41 ` [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Hans Verkuil
@ 2019-09-23 14:40 ` Boris Brezillon
2019-09-23 15:07 ` Hans Verkuil
0 siblings, 1 reply; 25+ messages in thread
From: Boris Brezillon @ 2019-09-23 14:40 UTC (permalink / raw)
To: Hans Verkuil
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On Mon, 23 Sep 2019 13:41:07 +0200
Hans Verkuil <hverkuil@xs4all.nl> wrote:
> Hi Boris,
>
> On 4/4/19 10:16 AM, Boris Brezillon wrote:
> > Hello,
> >
> > This RFC follows the discussion started by Hans [1] a few months back.
> > It does not try to address all the problem reported in this thread but
> > instead focuses on the FMT and BUF(S) ioctls.
> >
> > Note that my primary goal is to unify handling for multiplanar and
> > singleplanar formats and extend things to support the "single dmabuf
> > storing all pixel planes" issue.
> >
> > This version received a bit more testing than the previous one (added
> > new tests to v4l2-compliance [2] to make sure EXT ioctls work as
> > expected and also checked that !ext -> ext wrappers work correctly by
> > running the old tests). Note that I'm not planning to post those
> > v4l-utils patches on the ML until we've settled down on the userspace
> > API, unless I'm explicitly asked to do so.
> >
> > Right now I'm focusing on the case I was primarily interested in:
> > single dmabuf storing all pixel planes (each being at a different
> > offset), and it seems that patching the VB2 core to support that is
> > not a trivial task.
> >
> > So here are a few questions for V4L/DMABUF experts:
> > - Can the same dmabuf be mapped several times. I think it's okay apart
> > from the extra/needless time spent doing cache maintenance
> > operations, but there might be issues if an IOMMU is involved
> > (duplicate mappings?). If it's not okay, then we need to find a
> > solution to only attach/map the DMABUF once when it's used for
> > several planes (this is what I tried to do here [3], but I'm not
> > entirely happy with the implementation and started to investigate
> > another approach here [4]).
> > - How should we pass the offset to drivers that were previously using
> > the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
> > Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
> > case can be done in the core, but for an sg-table it's a bit more
> > complicated. Should drivers access this piece of information
> > directly from vb2_plane->dbuf_offset? And in that case, how do we
> > make sure drivers don't simply ignore the offset and assume it's
> > always zero?
> >
> > Few words about the feedback I got from Brian and Nicolas on my v1:
> >
> > - modifier field has been moved to v4l2_ext_format as suggested
> > - v4l2_timecode is still not present in v4l2_ext_buffer, but can be
> > added back thanks to the extra reserved space
> > - the ENUMFMT is left as is for now, because I think we want Maxime's
> > work on DRM/V4L format unification to land before reworking the
> > ioctl (exposing extra info about the format and not only the 4CC
> > code?). That also means that there's currently no way to know which
> > modifiers are supported
> > - EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
> > supported or not have not been added yet
>
> Can you post a v3, rebased on top of our current master branch? No other
> changes needed, just a rebase.
Ok, I'll try to do that next week.
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
2019-09-23 14:40 ` Boris Brezillon
@ 2019-09-23 15:07 ` Hans Verkuil
0 siblings, 0 replies; 25+ messages in thread
From: Hans Verkuil @ 2019-09-23 15:07 UTC (permalink / raw)
To: Boris Brezillon
Cc: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media, Tomasz Figa, Hirokazu Honda,
Nicolas Dufresne, Brian Starkey, kernel
On 9/23/19 4:40 PM, Boris Brezillon wrote:
> On Mon, 23 Sep 2019 13:41:07 +0200
> Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
>> Hi Boris,
>>
>> On 4/4/19 10:16 AM, Boris Brezillon wrote:
>>> Hello,
>>>
>>> This RFC follows the discussion started by Hans [1] a few months back.
>>> It does not try to address all the problem reported in this thread but
>>> instead focuses on the FMT and BUF(S) ioctls.
>>>
>>> Note that my primary goal is to unify handling for multiplanar and
>>> singleplanar formats and extend things to support the "single dmabuf
>>> storing all pixel planes" issue.
>>>
>>> This version received a bit more testing than the previous one (added
>>> new tests to v4l2-compliance [2] to make sure EXT ioctls work as
>>> expected and also checked that !ext -> ext wrappers work correctly by
>>> running the old tests). Note that I'm not planning to post those
>>> v4l-utils patches on the ML until we've settled down on the userspace
>>> API, unless I'm explicitly asked to do so.
>>>
>>> Right now I'm focusing on the case I was primarily interested in:
>>> single dmabuf storing all pixel planes (each being at a different
>>> offset), and it seems that patching the VB2 core to support that is
>>> not a trivial task.
>>>
>>> So here are a few questions for V4L/DMABUF experts:
>>> - Can the same dmabuf be mapped several times. I think it's okay apart
>>> from the extra/needless time spent doing cache maintenance
>>> operations, but there might be issues if an IOMMU is involved
>>> (duplicate mappings?). If it's not okay, then we need to find a
>>> solution to only attach/map the DMABUF once when it's used for
>>> several planes (this is what I tried to do here [3], but I'm not
>>> entirely happy with the implementation and started to investigate
>>> another approach here [4]).
>>> - How should we pass the offset to drivers that were previously using
>>> the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
>>> Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
>>> case can be done in the core, but for an sg-table it's a bit more
>>> complicated. Should drivers access this piece of information
>>> directly from vb2_plane->dbuf_offset? And in that case, how do we
>>> make sure drivers don't simply ignore the offset and assume it's
>>> always zero?
>>>
>>> Few words about the feedback I got from Brian and Nicolas on my v1:
>>>
>>> - modifier field has been moved to v4l2_ext_format as suggested
>>> - v4l2_timecode is still not present in v4l2_ext_buffer, but can be
>>> added back thanks to the extra reserved space
>>> - the ENUMFMT is left as is for now, because I think we want Maxime's
>>> work on DRM/V4L format unification to land before reworking the
>>> ioctl (exposing extra info about the format and not only the 4CC
>>> code?). That also means that there's currently no way to know which
>>> modifiers are supported
>>> - EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
>>> supported or not have not been added yet
>>
>> Can you post a v3, rebased on top of our current master branch? No other
>> changes needed, just a rebase.
>
> Ok, I'll try to do that next week.
>
Great. Then it's also best to wait until v5.4-rc1 has been merged back
into our tree.
Regards,
Hans
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
2019-10-08 9:11 Boris Brezillon
2019-10-08 9:13 ` Boris Brezillon
@ 2020-03-10 22:18 ` Fritz Koenig
1 sibling, 0 replies; 25+ messages in thread
From: Fritz Koenig @ 2020-03-10 22:18 UTC (permalink / raw)
To: boris.brezillon
Cc: Brian.Starkey, hans.verkuil, hiroh, kernel, laurent.pinchart,
linux-media, mchehab, nicolas, sakari.ailus, tfiga
Hi Boris,
On Tue, Oct 8, 2019 at 11:11 AM Boris Brezillon
<boris.brezillon@collabora.com> wrote:
> Hello,
>
> This RFC follows the discussion started by Hans [1] a few months back.
> It does not try to address all the problem reported in this thread but
> instead focuses on the FMT and BUF(S) ioctls.
>
> Note that my primary goal is to unify handling for multiplanar and
> singleplanar formats and extend things to support the "single dmabuf
> storing all pixel planes" issue.
>
> This version received a bit more testing than the previous one (added
> new tests to v4l2-compliance [2] to make sure EXT ioctls work as
> expected and also checked that !ext -> ext wrappers work correctly by
> running the old tests). Note that I'm not planning to post those
> v4l-utils patches on the ML until we've settled down on the userspace
> API, unless I'm explicitly asked to do so.
>
I'm new to V4L2, so I'm sorry if some of my questions don't make sense.
The venus codec can decode to UBWC format so I'm working with this
patch set to see how the modifiers flow will go. I've been able to
integrate these patches for the most part.
Is the expectation with these new ioctls that they will work seamlessly with
all codecs? Or that a codec can implement only the ones that are needed?
i.e. I only need to pass the modifier, so could I only implement S_EXT_FMT?
And then is the expectation that I know that for EXT I set the queue to
!MPLANE?
I find the interaction between _MPLANE and !MPLANE to still be a odd with
the new ioctls. I had thought that I could use the same queue designation
for all the calls. But for the codec I'm looking at (venus) it is MPLANE only,
so I call REQBUFS with V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE and all of the new
ioctls with V4L2_BUF_TYPE_VIDEO_CAPTURE. I'm failing to see how to do this
in a backward compatible way.
> Right now I'm focusing on the case I was primarily interested in:
> single dmabuf storing all pixel planes (each being at a different
> offset), and it seems that patching the VB2 core to support that is
> not a trivial task.
>
> So here are a few questions for V4L/DMABUF experts:
> - Can the same dmabuf be mapped several times. I think it's okay apart
> from the extra/needless time spent doing cache maintenance
> operations, but there might be issues if an IOMMU is involved
> (duplicate mappings?). If it's not okay, then we need to find a
> solution to only attach/map the DMABUF once when it's used for
> several planes (this is what I tried to do here [3], but I'm not
> entirely happy with the implementation and started to investigate
> another approach here [4]).
> - How should we pass the offset to drivers that were previously using
> the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
> Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
> case can be done in the core, but for an sg-table it's a bit more
> complicated. Should drivers access this piece of information
> directly from vb2_plane->dbuf_offset? And in that case, how do we
> make sure drivers don't simply ignore the offset and assume it's
> always zero?
>
> Few words about the feedback I got from Brian and Nicolas on my v1:
>
> - modifier field has been moved to v4l2_ext_format as suggested
> - v4l2_timecode is still not present in v4l2_ext_buffer, but can be
> added back thanks to the extra reserved space
> - the ENUMFMT is left as is for now, because I think we want Maxime's
> work on DRM/V4L format unification to land before reworking the
> ioctl (exposing extra info about the format and not only the 4CC
> code?). That also means that there's currently no way to know which
> modifiers are supported
> - EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
> supported or not have not been added yet
>
> Nothing has changed in v3, just rebased patches on top of media/master
> so we can discuss it during the Media Summit.
>
> Regards,
>
> Boris
>
> [1]https://www.mail-archive.com/linux-media@vger.kernel.org/msg135729.html
> [2]https://github.com/bbrezillon/v4l-utils/commits/master
> [3]https://github.com/bbrezillon/linux/commit/4882435f80b05a61827649d55cc0f0cee79680a7
> [4]https://github.com/bbrezillon/linux/commit/a415216c6aaab2d51f0bd62270b994c8196ddd90
>
> Boris Brezillon (5):
> media: v4l2: Extend pixel formats to unify single/multi-planar
> handling (and more)
> media: videobuf2: Expose helpers to implement the _ext_fmt and
> _ext_buf hooks
> media: mediabus: Add an helper to convert a ext_pix format to an
> mbus_fmt
> media: vivid: Convert the capture and output drivers to
> EXT_FMT/EXT_BUF
> media: vimc: Implement the ext_fmt and ext_buf hooks
>
> Hans Verkuil (1):
> media: v4l2: Add extended buffer operations
>
> .../media/common/videobuf2/videobuf2-core.c | 2 +
> .../media/common/videobuf2/videobuf2-v4l2.c | 534 ++++----
> drivers/media/platform/vimc/vimc-capture.c | 65 +-
> drivers/media/platform/vimc/vimc-common.c | 4 +-
> drivers/media/platform/vimc/vimc-common.h | 2 +-
> drivers/media/platform/vivid/vivid-core.c | 30 +-
> drivers/media/platform/vivid/vivid-vid-cap.c | 171 +--
> drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
> drivers/media/platform/vivid/vivid-vid-out.c | 195 +--
> drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
> drivers/media/v4l2-core/v4l2-dev.c | 54 +-
> drivers/media/v4l2-core/v4l2-ioctl.c | 1127 +++++++++++++++--
> include/media/v4l2-ioctl.h | 63 +
> include/media/v4l2-mediabus.h | 22 +
> include/media/videobuf2-core.h | 6 +-
> include/media/videobuf2-v4l2.h | 26 +-
> include/uapi/linux/videodev2.h | 211 +++
> 17 files changed, 1897 insertions(+), 645 deletions(-)
>
> --
> 2.21.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
2019-10-08 9:11 Boris Brezillon
@ 2019-10-08 9:13 ` Boris Brezillon
2020-03-10 22:18 ` Fritz Koenig
1 sibling, 0 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-10-08 9:13 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey, kernel
On Tue, 8 Oct 2019 11:11:13 +0200
Boris Brezillon <boris.brezillon@collabora.com> wrote:
Oops, forgot to update the subject. Should be:
"[RFC PATCH v3 0/6] media: v4l2: Add extended fmt and buffer ioctls"
> Hello,
>
> This RFC follows the discussion started by Hans [1] a few months back.
> It does not try to address all the problem reported in this thread but
> instead focuses on the FMT and BUF(S) ioctls.
>
> Note that my primary goal is to unify handling for multiplanar and
> singleplanar formats and extend things to support the "single dmabuf
> storing all pixel planes" issue.
>
> This version received a bit more testing than the previous one (added
> new tests to v4l2-compliance [2] to make sure EXT ioctls work as
> expected and also checked that !ext -> ext wrappers work correctly by
> running the old tests). Note that I'm not planning to post those
> v4l-utils patches on the ML until we've settled down on the userspace
> API, unless I'm explicitly asked to do so.
>
> Right now I'm focusing on the case I was primarily interested in:
> single dmabuf storing all pixel planes (each being at a different
> offset), and it seems that patching the VB2 core to support that is
> not a trivial task.
>
> So here are a few questions for V4L/DMABUF experts:
> - Can the same dmabuf be mapped several times. I think it's okay apart
> from the extra/needless time spent doing cache maintenance
> operations, but there might be issues if an IOMMU is involved
> (duplicate mappings?). If it's not okay, then we need to find a
> solution to only attach/map the DMABUF once when it's used for
> several planes (this is what I tried to do here [3], but I'm not
> entirely happy with the implementation and started to investigate
> another approach here [4]).
> - How should we pass the offset to drivers that were previously using
> the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
> Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
> case can be done in the core, but for an sg-table it's a bit more
> complicated. Should drivers access this piece of information
> directly from vb2_plane->dbuf_offset? And in that case, how do we
> make sure drivers don't simply ignore the offset and assume it's
> always zero?
>
> Few words about the feedback I got from Brian and Nicolas on my v1:
>
> - modifier field has been moved to v4l2_ext_format as suggested
> - v4l2_timecode is still not present in v4l2_ext_buffer, but can be
> added back thanks to the extra reserved space
> - the ENUMFMT is left as is for now, because I think we want Maxime's
> work on DRM/V4L format unification to land before reworking the
> ioctl (exposing extra info about the format and not only the 4CC
> code?). That also means that there's currently no way to know which
> modifiers are supported
> - EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
> supported or not have not been added yet
>
> Nothing has changed in v3, just rebased patches on top of media/master
> so we can discuss it during the Media Summit.
>
> Regards,
>
> Boris
>
> [1]https://www.mail-archive.com/linux-media@vger.kernel.org/msg135729.html
> [2]https://github.com/bbrezillon/v4l-utils/commits/master
> [3]https://github.com/bbrezillon/linux/commit/4882435f80b05a61827649d55cc0f0cee79680a7
> [4]https://github.com/bbrezillon/linux/commit/a415216c6aaab2d51f0bd62270b994c8196ddd90
>
> Boris Brezillon (5):
> media: v4l2: Extend pixel formats to unify single/multi-planar
> handling (and more)
> media: videobuf2: Expose helpers to implement the _ext_fmt and
> _ext_buf hooks
> media: mediabus: Add an helper to convert a ext_pix format to an
> mbus_fmt
> media: vivid: Convert the capture and output drivers to
> EXT_FMT/EXT_BUF
> media: vimc: Implement the ext_fmt and ext_buf hooks
>
> Hans Verkuil (1):
> media: v4l2: Add extended buffer operations
>
> .../media/common/videobuf2/videobuf2-core.c | 2 +
> .../media/common/videobuf2/videobuf2-v4l2.c | 534 ++++----
> drivers/media/platform/vimc/vimc-capture.c | 65 +-
> drivers/media/platform/vimc/vimc-common.c | 4 +-
> drivers/media/platform/vimc/vimc-common.h | 2 +-
> drivers/media/platform/vivid/vivid-core.c | 30 +-
> drivers/media/platform/vivid/vivid-vid-cap.c | 171 +--
> drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
> drivers/media/platform/vivid/vivid-vid-out.c | 195 +--
> drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
> drivers/media/v4l2-core/v4l2-dev.c | 54 +-
> drivers/media/v4l2-core/v4l2-ioctl.c | 1127 +++++++++++++++--
> include/media/v4l2-ioctl.h | 63 +
> include/media/v4l2-mediabus.h | 22 +
> include/media/videobuf2-core.h | 6 +-
> include/media/videobuf2-v4l2.h | 26 +-
> include/uapi/linux/videodev2.h | 211 +++
> 17 files changed, 1897 insertions(+), 645 deletions(-)
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls
@ 2019-10-08 9:11 Boris Brezillon
2019-10-08 9:13 ` Boris Brezillon
2020-03-10 22:18 ` Fritz Koenig
0 siblings, 2 replies; 25+ messages in thread
From: Boris Brezillon @ 2019-10-08 9:11 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Hans Verkuil, Laurent Pinchart,
Sakari Ailus, linux-media
Cc: Tomasz Figa, Hirokazu Honda, Nicolas Dufresne, Brian Starkey,
kernel, Boris Brezillon
Hello,
This RFC follows the discussion started by Hans [1] a few months back.
It does not try to address all the problem reported in this thread but
instead focuses on the FMT and BUF(S) ioctls.
Note that my primary goal is to unify handling for multiplanar and
singleplanar formats and extend things to support the "single dmabuf
storing all pixel planes" issue.
This version received a bit more testing than the previous one (added
new tests to v4l2-compliance [2] to make sure EXT ioctls work as
expected and also checked that !ext -> ext wrappers work correctly by
running the old tests). Note that I'm not planning to post those
v4l-utils patches on the ML until we've settled down on the userspace
API, unless I'm explicitly asked to do so.
Right now I'm focusing on the case I was primarily interested in:
single dmabuf storing all pixel planes (each being at a different
offset), and it seems that patching the VB2 core to support that is
not a trivial task.
So here are a few questions for V4L/DMABUF experts:
- Can the same dmabuf be mapped several times. I think it's okay apart
from the extra/needless time spent doing cache maintenance
operations, but there might be issues if an IOMMU is involved
(duplicate mappings?). If it's not okay, then we need to find a
solution to only attach/map the DMABUF once when it's used for
several planes (this is what I tried to do here [3], but I'm not
entirely happy with the implementation and started to investigate
another approach here [4]).
- How should we pass the offset to drivers that were previously using
the get_cookie() (or the dma_sg wrapper) to retrieve an sg table.
Adding the offset to the dma_addr or vaddr for vmalloc or dma-contig
case can be done in the core, but for an sg-table it's a bit more
complicated. Should drivers access this piece of information
directly from vb2_plane->dbuf_offset? And in that case, how do we
make sure drivers don't simply ignore the offset and assume it's
always zero?
Few words about the feedback I got from Brian and Nicolas on my v1:
- modifier field has been moved to v4l2_ext_format as suggested
- v4l2_timecode is still not present in v4l2_ext_buffer, but can be
added back thanks to the extra reserved space
- the ENUMFMT is left as is for now, because I think we want Maxime's
work on DRM/V4L format unification to land before reworking the
ioctl (exposing extra info about the format and not only the 4CC
code?). That also means that there's currently no way to know which
modifiers are supported
- EXT_FMT/EXT_BUF capability flags to detect whether new ioctls are
supported or not have not been added yet
Nothing has changed in v3, just rebased patches on top of media/master
so we can discuss it during the Media Summit.
Regards,
Boris
[1]https://www.mail-archive.com/linux-media@vger.kernel.org/msg135729.html
[2]https://github.com/bbrezillon/v4l-utils/commits/master
[3]https://github.com/bbrezillon/linux/commit/4882435f80b05a61827649d55cc0f0cee79680a7
[4]https://github.com/bbrezillon/linux/commit/a415216c6aaab2d51f0bd62270b994c8196ddd90
Boris Brezillon (5):
media: v4l2: Extend pixel formats to unify single/multi-planar
handling (and more)
media: videobuf2: Expose helpers to implement the _ext_fmt and
_ext_buf hooks
media: mediabus: Add an helper to convert a ext_pix format to an
mbus_fmt
media: vivid: Convert the capture and output drivers to
EXT_FMT/EXT_BUF
media: vimc: Implement the ext_fmt and ext_buf hooks
Hans Verkuil (1):
media: v4l2: Add extended buffer operations
.../media/common/videobuf2/videobuf2-core.c | 2 +
.../media/common/videobuf2/videobuf2-v4l2.c | 534 ++++----
drivers/media/platform/vimc/vimc-capture.c | 65 +-
drivers/media/platform/vimc/vimc-common.c | 4 +-
drivers/media/platform/vimc/vimc-common.h | 2 +-
drivers/media/platform/vivid/vivid-core.c | 30 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 171 +--
drivers/media/platform/vivid/vivid-vid-cap.h | 15 +-
drivers/media/platform/vivid/vivid-vid-out.c | 195 +--
drivers/media/platform/vivid/vivid-vid-out.h | 15 +-
drivers/media/v4l2-core/v4l2-dev.c | 54 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 1127 +++++++++++++++--
include/media/v4l2-ioctl.h | 63 +
include/media/v4l2-mediabus.h | 22 +
include/media/videobuf2-core.h | 6 +-
include/media/videobuf2-v4l2.h | 26 +-
include/uapi/linux/videodev2.h | 211 +++
17 files changed, 1897 insertions(+), 645 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2020-03-10 22:18 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-04 8:16 [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Boris Brezillon
2019-04-11 7:59 ` Hans Verkuil
2019-04-11 10:36 ` Boris Brezillon
2019-04-11 10:38 ` Hans Verkuil
2019-04-12 8:25 ` Boris Brezillon
2019-04-12 8:33 ` Boris Brezillon
2019-04-12 9:36 ` Hans Verkuil
2019-04-04 8:16 ` [RFC PATCH v2 2/7] media: v4l2: Extend pixel formats to unify single/multi-planar handling (and more) Boris Brezillon
2019-04-11 8:24 ` Hans Verkuil
2019-04-11 8:37 ` Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 3/7] media: v4l2: Add extended buffer operations Boris Brezillon
2019-04-12 8:57 ` Boris Brezillon
2019-05-08 13:58 ` Hans Verkuil
2019-05-16 8:23 ` Tomasz Figa
2019-04-04 8:16 ` [RFC PATCH v2 4/7] media: videobuf2: Expose helpers to implement the _ext_fmt and _ext_buf hooks Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 5/7] media: mediabus: Add an helper to convert a ext_pix format to an mbus_fmt Boris Brezillon
2019-04-04 8:16 ` [RFC PATCH v2 6/7] media: vivid: Convert the capture and output drivers to EXT_FMT/EXT_BUF Boris Brezillon
2019-04-04 8:17 ` [RFC PATCH v2 7/7] media: vimc: Implement the ext_fmt and ext_buf hooks Boris Brezillon
2019-09-23 11:41 ` [RFC PATCH v2 0/7] media: v4l2: Add extended fmt and buffer ioctls Hans Verkuil
2019-09-23 14:40 ` Boris Brezillon
2019-09-23 15:07 ` Hans Verkuil
2019-10-08 9:11 Boris Brezillon
2019-10-08 9:13 ` Boris Brezillon
2020-03-10 22:18 ` Fritz Koenig
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).