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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 05410C433E0 for ; Fri, 3 Jul 2020 08:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2857207DA for ; Fri, 3 Jul 2020 08:06:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="uqKM0qgk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726581AbgGCIGU (ORCPT ); Fri, 3 Jul 2020 04:06:20 -0400 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]:46349 "EHLO lb3-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725891AbgGCIGT (ORCPT ); Fri, 3 Jul 2020 04:06:19 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id rGi2j86C1mVFqrGi5j7GWZ; Fri, 03 Jul 2020 10:06:15 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s1; t=1593763575; bh=b4jvdZMiRl+wQlE8aK7iGvK92VjV3a/6aX4pFQUlAY4=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=uqKM0qgkfVWerqlbG6o3xBiv6+lkwTSdn60vng7VtUX2pCKAfz2b12dNbn4UJ5vsi /B3ivaZOlPPDlw+I9/SyuEsyK9WRAdLWaQ+O/4mfNSw49CA0uoFERSqBRcpNXwADUU s2DYzRfN8c1z9hSRV8JWH8szoCVvgtfCFZy0lsDDaQyYSbb2dOQZvHYY4F6HRnA2fm p/knxlfOEA3ND2IsaeHeX87zsidWl/1CprmWYbzWMu5NCm+X+gspdYYjA+/lIH6ipM F2J4TffZHGM6u99C2dz41Z6HQADENLofvftmn1nACb499MaCVYEomW1emX8Y/7ExNv QMNhQ80petZlw== Subject: Re: [RFC PATCH v2 12/18] media: tegra-video: Add support for selection ioctl ops To: Sowjanya Komatineni , thierry.reding@gmail.com, jonathanh@nvidia.com, frankc@nvidia.com, sakari.ailus@iki.fi, robh+dt@kernel.org, helen.koike@collabora.com Cc: digetx@gmail.com, sboyd@kernel.org, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org References: <1592358094-23459-1-git-send-email-skomatineni@nvidia.com> <1592358094-23459-13-git-send-email-skomatineni@nvidia.com> From: Hans Verkuil Message-ID: Date: Fri, 3 Jul 2020 10:06:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfJibOq/j4tqoc36sc4WrtRfP/A0osTMUl1TNKLANrgu56/SySM9PwU8/7zlFaI92I2Zm+b7yAimCBtoVhEq0JGdG/Qu6rWHiZR2VRfdU8v3TAesoYmCf 12+lmuLHRoPvH8otC/RKqgD6o2UUMxNGygKPVInnM34BF/htxuI8rRF6jG8IbW+Y05Ebu5IdKMwEu/FtgiAnQCvhSLMvGxIVTMF01lScqwjNQ/P/elK9XYLK DCsRPHwA+4jMO4dF+3QmpcHeAsKsAdN3bjqSYSho3E6zHZYEP9a7V4HEjL2J66sJ/IYpfJD8zVYapSUiU9Si6ArWPuN1OkLmpmzy+07A1MybGJJf5TrZuz4/ mvSK/CItcwqWHuLoxQDh2IbdL7+Hp52d7L6QTMFWZQoXBXQujIRJckCIgnZDvueyk+AyhjMt8ZGAViX6dB01sBUyIzznC1nEweu7Rw5EkEJmj2UFrhJJfHUN 5HtqnX3wzLVieIf0NHPwb0Fdj1ddMehpgkMmA4w0PzD1DLe4Ideui72Y7suyfaEy7GXK0/WwkTTu1C7/wlrLvMwUrQEVIMcxMyc080Eyo6CeFoje9z4iuiHy USmgj20dEE+T9RxO/0IEl8dU61xTek0qZACAwgVjimcDDrD4JCV+RfscsZjN3urSkOLgUPAQlyOySgTitx1SJKDV Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/07/2020 23:20, Sowjanya Komatineni wrote: > > On 7/2/20 6:54 AM, Hans Verkuil wrote: >> On 17/06/2020 03:41, Sowjanya Komatineni wrote: >>> This patch adds selection v4l2 ioctl operations to allow configuring >>> a selection rectangle in the sensor through the Tegra video device >>> node. >>> >>> Some sensor drivers supporting crop uses try_crop rectangle from >>> v4l2_subdev_pad_config during try format for computing binning. >>> >>> So with selection ops support, this patch also updates try format >>> to use try crop rectangle either from subdev frame size enumeration >>> or from subdev crop boundary. >>> >>> Signed-off-by: Sowjanya Komatineni >>> --- >>> drivers/staging/media/tegra-video/vi.c | 106 +++++++++++++++++++++++++++++++++ >>> 1 file changed, 106 insertions(+) >>> >>> diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c >>> index 506c263..f9eb96b 100644 >>> --- a/drivers/staging/media/tegra-video/vi.c >>> +++ b/drivers/staging/media/tegra-video/vi.c >>> @@ -427,6 +427,13 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, >>> struct v4l2_subdev *subdev; >>> struct v4l2_subdev_format fmt; >>> struct v4l2_subdev_pad_config *pad_cfg; >>> + struct v4l2_subdev_frame_size_enum fse = { >>> + .which = V4L2_SUBDEV_FORMAT_TRY, >>> + }; >>> + struct v4l2_subdev_selection sdsel = { >>> + .which = V4L2_SUBDEV_FORMAT_ACTIVE, >>> + .target = V4L2_SEL_TGT_CROP_BOUNDS, >>> + }; >>> int ret; >>> >>> subdev = tegra_channel_get_remote_subdev(chan, true); >>> @@ -449,6 +456,24 @@ static int __tegra_channel_try_format(struct tegra_vi_channel *chan, >>> fmt.which = V4L2_SUBDEV_FORMAT_TRY; >>> fmt.pad = 0; >>> v4l2_fill_mbus_format(&fmt.format, pix, fmtinfo->code); >>> + >>> + /* >>> + * Attempt to obtain the format size from subdev. >>> + * If not available, try to get crop boundary from subdev. >>> + */ >>> + fse.code = fmtinfo->code; >>> + ret = v4l2_subdev_call(subdev, pad, enum_frame_size, pad_cfg, &fse); >>> + if (ret) { >>> + ret = v4l2_subdev_call(subdev, pad, get_selection, NULL, &sdsel); >>> + if (ret) >>> + return -EINVAL; >>> + pad_cfg->try_crop.width = sdsel.r.width; >>> + pad_cfg->try_crop.height = sdsel.r.height; >>> + } else { >>> + pad_cfg->try_crop.width = fse.max_width; >>> + pad_cfg->try_crop.height = fse.max_height; >>> + } >>> + >>> ret = v4l2_subdev_call(subdev, pad, set_fmt, pad_cfg, &fmt); >>> if (ret < 0) >>> return ret; >>> @@ -540,6 +565,85 @@ static int tegra_channel_set_subdev_active_fmt(struct tegra_vi_channel *chan) >>> return 0; >>> } >>> >>> +static int tegra_channel_g_selection(struct file *file, void *priv, >>> + struct v4l2_selection *sel) >>> +{ >>> + struct tegra_vi_channel *chan = video_drvdata(file); >>> + struct v4l2_subdev *subdev; >>> + struct v4l2_subdev_format fmt = { >>> + .which = V4L2_SUBDEV_FORMAT_ACTIVE, >>> + }; >>> + struct v4l2_subdev_selection sdsel = { >>> + .which = V4L2_SUBDEV_FORMAT_ACTIVE, >>> + .target = sel->target, >>> + }; >>> + int ret; >>> + >>> + if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) >>> + return -ENOTTY; >>> + >>> + if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) >>> + return -EINVAL; >>> + /* >>> + * Try the get selection operation and fallback to get format if not >>> + * implemented. >>> + */ >>> + subdev = tegra_channel_get_remote_subdev(chan, true); >>> + ret = v4l2_subdev_call(subdev, pad, get_selection, NULL, &sdsel); >>> + if (!ret) >>> + sel->r = sdsel.r; >>> + if (ret != -ENOIOCTLCMD) >>> + return ret; >>> + >>> + ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt); >>> + if (ret < 0) >>> + return ret; >>> + >>> + sel->r.left = 0; >>> + sel->r.top = 0; >>> + sel->r.width = fmt.format.width; >>> + sel->r.height = fmt.format.height; >>> + >>> + return 0; >>> +} >>> + >>> +static int tegra_channel_s_selection(struct file *file, void *fh, >>> + struct v4l2_selection *sel) >>> +{ >>> + struct tegra_vi_channel *chan = video_drvdata(file); >>> + struct v4l2_subdev *subdev; >>> + int ret; >>> + struct v4l2_subdev_selection sdsel = { >>> + .which = V4L2_SUBDEV_FORMAT_ACTIVE, >>> + .target = sel->target, >>> + .flags = sel->flags, >>> + .r = sel->r, >>> + }; >>> + >> This function doesn't check if the subdev actually supports set_selection. >> The imx219 is one such driver: it supports get_selection, but not set_selection. >> >> So this code should add these lines to fix the v4l2-compliance fail: >> >> subdev = tegra_channel_get_remote_subdev(chan, true); >> >> if (!v4l2_subdev_has_op(subdev, pad, set_selection)) >> return -ENOTTY; >> > v4l2_subdev_call() does that check and returns -ENOIOCTLCMD when > specified subdev ops does not exist. But that test happens too late. In the v4l2-compliance test it fails in the sel->type test below, so it returns EINVAL instead of ENOTTY. >>> + if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) >>> + return -ENOTTY; I think this test should come before the v4l2_subdev_has_op test since there is probably no subdev if the TPG is enabled. So: if (IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)) return -ENOTTY; subdev = tegra_channel_get_remote_subdev(chan, true); if (!v4l2_subdev_has_op(subdev, pad, set_selection)) return -ENOTTY; Regards, Hans >>> + >>> + if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) >>> + return -EINVAL; >>> + >>> + if (vb2_is_busy(&chan->queue)) >>> + return -EBUSY; >>> + >>> + subdev = tegra_channel_get_remote_subdev(chan, true); >> And this line can be dropped. >> >> Regards, >> >> Hans >> >>> + ret = v4l2_subdev_call(subdev, pad, set_selection, NULL, &sdsel); >>> + if (!ret) { >>> + sel->r = sdsel.r; >>> + /* >>> + * Subdev active format resolution may have changed during >>> + * set selection operation. So, update channel format to >>> + * the sub-device active format. >>> + */ >>> + return tegra_channel_set_subdev_active_fmt(chan); >>> + } >>> + >>> + return ret; >>> +} >>> + >>> static int tegra_channel_enum_input(struct file *file, void *fh, >>> struct v4l2_input *inp) >>> { >>> @@ -597,6 +701,8 @@ static const struct v4l2_ioctl_ops tegra_channel_ioctl_ops = { >>> .vidioc_streamoff = vb2_ioctl_streamoff, >>> .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, >>> .vidioc_unsubscribe_event = v4l2_event_unsubscribe, >>> + .vidioc_g_selection = tegra_channel_g_selection, >>> + .vidioc_s_selection = tegra_channel_s_selection, >>> }; >>> >>> /* >>>