From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66DEFC282CE for ; Tue, 4 Jun 2019 07:11:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B2DD2493E for ; Tue, 4 Jun 2019 07:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbfFDHLI (ORCPT ); Tue, 4 Jun 2019 03:11:08 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:40018 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726568AbfFDHLI (ORCPT ); Tue, 4 Jun 2019 03:11:08 -0400 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 10C8E27E3EC; Tue, 4 Jun 2019 08:11:06 +0100 (BST) Date: Tue, 4 Jun 2019 09:11:02 +0200 From: Boris Brezillon To: Hans Verkuil Cc: Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Sakari Ailus , linux-media@vger.kernel.org, kernel@collabora.com, Tomasz Figa , Hirokazu Honda , Nicolas Dufresne , Sylwester Nawrocki Subject: Re: [PATCH v5 2/2] media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap,out}_mplane Message-ID: <20190604091102.4a820e09@collabora.com> In-Reply-To: <71e2f8b2-db8e-68da-f627-86b22e5a0d39@xs4all.nl> References: <20190603135850.7689-1-boris.brezillon@collabora.com> <20190603135850.7689-2-boris.brezillon@collabora.com> <71e2f8b2-db8e-68da-f627-86b22e5a0d39@xs4all.nl> Organization: Collabora X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Tue, 4 Jun 2019 09:02:56 +0200 Hans Verkuil 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 > > --- > > 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(-) > > > > > > > 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; > More on that matter: it happened because I blindly fixed a warning reported by checkpatch --strict saying that parens were useless here. Looks like checkpatch was wrong :-/.