On Tue, 4 Jun 2019 09:02:56 +0200
Hans Verkuil <hverkuil@xxxxxxxxx> wrote:
> On 6/3/19 3:58 PM, 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.
> >
> > Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
> > ---
> > Changes in v5:
> > - None
> >
> > Changes in v4:
> > - None
> >
> > Changes in v3:
> > - Send this patch separately (was previously part of the EXT_BUF/FMT
> > rework)
> >
> > Changes in v2:
> > - None
> > ---
> > drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +-
> > drivers/media/platform/exynos-gsc/gsc-core.c | 2 +-
> > drivers/media/platform/exynos-gsc/gsc-core.h | 2 +-
> > drivers/media/platform/exynos-gsc/gsc-m2m.c | 10 ++++-----
> > .../media/platform/exynos4-is/fimc-capture.c | 6 +++---
> > .../platform/exynos4-is/fimc-isp-video.c | 6 +++---
> > drivers/media/platform/exynos4-is/fimc-lite.c | 6 +++---
> > drivers/media/platform/exynos4-is/fimc-m2m.c | 8 +++----
> > .../media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 ++--
> > drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 ++++++++--------
> > .../platform/mtk-vcodec/mtk_vcodec_dec.c | 12 +++++------
> > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 12 +++++------
> > .../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 | 12 +++++------
> > drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 +++++------
> > 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_v4l2.c | 12 +++++------
> > include/media/v4l2-ioctl.h | 14 ++-----------
> > 30 files changed, 91 insertions(+), 128 deletions(-)
> >
>
> <snip>
>
> > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
> > index 0fbee3caef5d..3768eb012cef 100644
> > --- a/drivers/media/v4l2-core/v4l2-ioctl.c
> > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
> > @@ -1382,6 +1382,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);
> >
> > @@ -1391,30 +1392,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;
>
> We got kbuild test robot complaints about this. The new check is a bit
> complicated, and I propose we do this instead:
>
> case V4L2_BUF_TYPE_VIDEO_CAPTURE:
> if (!(vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) &&
> ops->vidioc_enum_fmt_vid_cap)
> ret = ops->vidioc_enum_fmt_vid_cap(file, fh, arg);
> break;
> case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> if ((vdev->device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE) &&
> ops->vidioc_enum_fmt_vid_cap)
> ret = ops->vidioc_enum_fmt_vid_cap(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;
>
> And the same here, of course.
Sorry about that. I had it fixed locally but forgot to amend the
commit :-/. I'm sending a v6 right now.
