From: Hans Verkuil <hverkuil@xs4all.nl>
To: Sowjanya Komatineni <skomatineni@nvidia.com>,
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
Subject: Re: [RFC PATCH v2 12/18] media: tegra-video: Add support for selection ioctl ops
Date: Fri, 3 Jul 2020 10:06:09 +0200 [thread overview]
Message-ID: <a95717b6-e2ee-78df-5145-de265805b3d4@xs4all.nl> (raw)
In-Reply-To: <c82a000a-7766-c933-fd69-24eb4885fc14@nvidia.com>
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 <skomatineni@nvidia.com>
>>> ---
>>> 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,
>>> };
>>>
>>> /*
>>>
next prev parent reply other threads:[~2020-07-03 8:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 1:41 [RFC PATCH v2 00/18] Support for Tegra video capture from external sensor Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 01/18] dt-bindings: i2c: tegra: Document Tegra210 VI I2C clocks and power-domains Sowjanya Komatineni
2020-07-13 23:49 ` Rob Herring
2020-06-17 1:41 ` [RFC PATCH v2 02/18] arm64: tegra: Add missing clocks and power-domains to Tegra210 VI I2C Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 03/18] i2c: tegra: Don't mark VI I2C as IRQ safe runtime PM Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 04/18] i2c: tegra: Fix the error path in tegra_i2c_runtime_resume Sowjanya Komatineni
2020-06-17 4:52 ` Dmitry Osipenko
2020-06-17 1:41 ` [RFC PATCH v2 05/18] i2c: tegra: Fix runtime resume to re-init VI I2C Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 06/18] i2c: tegra: Avoid tegra_i2c_init_dma() for Tegra210 vi i2c Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 07/18] media: tegra-video: Fix channel format alignment Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 08/18] media: tegra-video: Enable TPG based on kernel config Sowjanya Komatineni
2020-06-29 9:28 ` Hans Verkuil
2020-06-29 14:48 ` Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 09/18] media: tegra-video: Update format lookup to offset based Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 10/18] dt-bindings: tegra: Update VI and CSI bindings with port info Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 11/18] media: tegra-video: Add support for external sensor capture Sowjanya Komatineni
2020-07-06 9:10 ` Hans Verkuil
2020-07-06 16:53 ` Sowjanya Komatineni
[not found] ` <6e09f5d3-85ca-5bf9-8617-b9c8bec36615@nvidia.com>
2020-07-07 9:51 ` Hans Verkuil
2020-07-07 10:32 ` Sowjanya Komatineni
[not found] ` <6ee18b4d-b63b-8053-1b7e-c3ec7c1d4956@nvidia.com>
[not found] ` <6846e5bb-db1d-c2ff-c52c-70a2094c5b50@nvidia.com>
2020-07-07 19:35 ` Hans Verkuil
2020-07-07 20:29 ` Sowjanya Komatineni
2020-07-07 20:41 ` Sowjanya Komatineni
2020-07-07 21:15 ` Sowjanya Komatineni
2020-07-06 11:49 ` Hans Verkuil
2020-06-17 1:41 ` [RFC PATCH v2 12/18] media: tegra-video: Add support for selection ioctl ops Sowjanya Komatineni
2020-07-02 13:54 ` Hans Verkuil
2020-07-02 21:20 ` Sowjanya Komatineni
2020-07-03 8:06 ` Hans Verkuil [this message]
2020-07-03 17:12 ` Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 13/18] gpu: host1x: mipi: Update tegra_mipi_request() to be node based Sowjanya Komatineni
2020-06-18 0:27 ` Dmitry Osipenko
2020-06-17 1:41 ` [RFC PATCH v2 14/18] gpu: host1x: mipi: Split tegra_mipi_calibrate and tegra_mipi_wait Sowjanya Komatineni
2020-06-18 0:35 ` Dmitry Osipenko
2020-06-17 1:41 ` [RFC PATCH v2 15/18] media: tegra-video: Add CSI MIPI pads calibration Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 16/18] media: tegra-video: Compute settle times based on the clock rate Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 17/18] arm64: tegra: jetson-tx1: Add camera supplies Sowjanya Komatineni
2020-06-17 1:41 ` [RFC PATCH v2 18/18] arm64: tegra: Enable Tegra VI CSI support for Jetson Nano Sowjanya Komatineni
2020-06-30 9:21 ` [RFC PATCH v2 00/18] Support for Tegra video capture from external sensor Hans Verkuil
2020-06-30 14:58 ` Sowjanya Komatineni
2020-06-30 15:13 ` Hans Verkuil
2020-06-30 15:44 ` Sowjanya Komatineni
2020-06-30 16:17 ` Sowjanya Komatineni
2020-06-30 16:34 ` Sowjanya Komatineni
2020-07-01 16:54 ` Hans Verkuil
2020-07-01 17:07 ` Sowjanya Komatineni
2020-07-02 10:49 ` Hans Verkuil
2020-07-02 14:08 ` Hans Verkuil
2020-07-02 21:21 ` Sowjanya Komatineni
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=a95717b6-e2ee-78df-5145-de265805b3d4@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=devicetree@vger.kernel.org \
--cc=digetx@gmail.com \
--cc=frankc@nvidia.com \
--cc=gregkh@linuxfoundation.org \
--cc=helen.koike@collabora.com \
--cc=jonathanh@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@iki.fi \
--cc=sboyd@kernel.org \
--cc=skomatineni@nvidia.com \
--cc=thierry.reding@gmail.com \
/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
all inboxes | Powered by JetHome®