From: Hans Verkuil <hverkuil@xs4all.nl>
To: Ricardo Ribalda <ribalda@chromium.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Tomasz Figa <tfiga@chromium.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
senozhatsky@chromium.org
Subject: Re: [PATCH 10/10] media: uvcvideo: Populate only active control classes
Date: Thu, 11 Mar 2021 15:31:04 +0100 [thread overview]
Message-ID: <f2341e0e-e9c9-a1f6-2d9f-4355e232cf4a@xs4all.nl> (raw)
In-Reply-To: <20210311122040.1264410-12-ribalda@chromium.org>
On 11/03/2021 13:20, Ricardo Ribalda wrote:
> Do not create Control Classes for empty classes.
Shouldn't this be squashed with patch 06/10?
Regards,
Hans
>
> Fixes v4l2-compliance:
>
> Control ioctls (Input 0):
> fail: v4l2-test-controls.cpp(255): no controls in class 009d0000
> test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: FAIL
>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 11 +++++++++++
> drivers/media/usb/uvc/uvc_driver.c | 1 -
> drivers/media/usb/uvc/uvcvideo.h | 1 -
> 3 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 433342efc63f..5efbb3b5aa5b 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -2128,6 +2128,17 @@ static int __uvc_ctrl_add_mapping(struct uvc_device *dev,
> if (map->set == NULL)
> map->set = uvc_set_le_value;
>
> + switch (V4L2_CTRL_ID2WHICH(map->id)) {
> + case V4L2_CTRL_ID2WHICH(V4L2_CID_CAMERA_CLASS):
> + dev->ctrl_class_unit->ctrl_class.bmControls[0] |=
> + BIT(UVC_CC_CAMERA_CLASS);
> + break;
> + case V4L2_CTRL_ID2WHICH(V4L2_CID_USER_CLASS):
> + dev->ctrl_class_unit->ctrl_class.bmControls[0] |=
> + BIT(UVC_CC_USER_CLASS);
> + break;
> + }
> +
> list_add_tail(&map->list, &ctrl->info.mappings);
> uvc_dbg(dev, CONTROL, "Adding mapping '%s' to control %pUl/%u\n",
> map->name, ctrl->info.entity, ctrl->info.selector);
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 996e8bd06ac5..4f368ab3a1f1 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -1501,7 +1501,6 @@ static int uvc_ctrl_class_parse(struct uvc_device *dev)
>
> unit->ctrl_class.bControlSize = 1;
> unit->ctrl_class.bmControls = (u8 *)unit + sizeof(*unit);
> - unit->ctrl_class.bmControls[0] = (1 << (UVC_CC_LAST_CLASS + 1)) - 1;
> unit->get_info = uvc_ctrl_class_get_info;
> strncpy(unit->name, "Control Class", sizeof(unit->name) - 1);
>
> diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
> index 1d59ac10c2eb..cc573d63e459 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -186,7 +186,6 @@
> */
> #define UVC_CC_CAMERA_CLASS 0
> #define UVC_CC_USER_CLASS 1
> -#define UVC_CC_LAST_CLASS UVC_CC_USER_CLASS
>
> /* ------------------------------------------------------------------------
> * Driver specific constants.
>
next prev parent reply other threads:[~2021-03-11 14:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 12:20 [PATCH 00/10] uvcvideo: Pass v4l2-compliance test Ricardo Ribalda
2021-03-11 12:20 ` [PATCH 01/10] media: uvcvideo: Return -EINVAL for REQUEST API Ricardo Ribalda
2021-03-11 12:20 ` [PATCH] media: videobuf2: Explicitly state max size of planes Ricardo Ribalda
2021-03-11 12:20 ` [PATCH 02/10] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-11 15:42 ` Laurent Pinchart
2021-03-11 12:20 ` [PATCH 03/10] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-11 14:08 ` Ricardo Ribalda
2021-03-11 15:57 ` Laurent Pinchart
2021-03-11 21:56 ` Ricardo Ribalda Delgado
2021-03-11 14:08 ` Hans Verkuil
2021-03-11 12:20 ` [PATCH 04/10] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-11 12:20 ` [PATCH 05/10] media: uvcvideo: Define Control and GUIDs for class ctrls Ricardo Ribalda
2021-03-11 12:20 ` [PATCH 06/10] media: uvcvideo: Implement UVC_CTRL_CLASS_UNIT Ricardo Ribalda
2021-03-11 16:06 ` Laurent Pinchart
2021-03-11 12:20 ` [PATCH 07/10] media: uvcvideo: set error_idx to count on EACCESS Ricardo Ribalda
2021-03-11 16:18 ` Laurent Pinchart
2021-03-11 21:51 ` Ricardo Ribalda Delgado
2021-03-11 12:20 ` [PATCH 08/10] media: uvcvideo: Always return a value on V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-11 16:21 ` Laurent Pinchart
2021-03-11 12:20 ` [PATCH 09/10] media: uvcvideo: Do not create initial events for class ctrls Ricardo Ribalda
2021-03-11 12:20 ` [PATCH 10/10] media: uvcvideo: Populate only active control classes Ricardo Ribalda
2021-03-11 14:31 ` Hans Verkuil [this message]
2021-03-11 15:21 ` Ricardo Ribalda Delgado
2021-03-11 15:59 ` Laurent Pinchart
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=f2341e0e-e9c9-a1f6-2d9f-4355e232cf4a@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=ribalda@chromium.org \
--cc=senozhatsky@chromium.org \
--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
all inboxes | Powered by JetHome®