From: Boris Brezillon <boris.brezillon@collabora.com>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
linux-media@vger.kernel.org, Tomasz Figa <tfiga@chromium.org>,
Hirokazu Honda <hiroh@chromium.org>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Brian Starkey <Brian.Starkey@arm.com>,
kernel@collabora.com
Subject: Re: [RFC PATCH v2 1/7] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane
Date: Thu, 11 Apr 2019 12:36:36 +0200 [thread overview]
Message-ID: <20190411123636.07990b79@collabora.com> (raw)
In-Reply-To: <c13c2c30-f78e-1cf2-26d3-1554e22947c3@xs4all.nl>
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?
next prev parent reply other threads:[~2019-04-11 10:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190411123636.07990b79@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=Brian.Starkey@arm.com \
--cc=hans.verkuil@cisco.com \
--cc=hiroh@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=nicolas@ndufresne.ca \
--cc=sakari.ailus@iki.fi \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).