linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	tfiga@chromium.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v6 12/17] media: uvcvideo: Set unique vdev name based in type
Date: Wed, 17 Mar 2021 17:45:06 +0100	[thread overview]
Message-ID: <20210317164511.39967-13-ribalda@chromium.org> (raw)
In-Reply-To: <20210317164511.39967-1-ribalda@chromium.org>

All the entities must have a unique name. We can have a descriptive and
unique name by appending the function and the entity->id.

This is even resilent to multi chain devices.

Fixes v4l2-compliance:
Media Controller ioctls:
                fail: v4l2-test-media.cpp(205): v2_entity_names_set.find(key) != v2_entity_names_set.end()
        test MEDIA_IOC_G_TOPOLOGY: FAIL
                fail: v4l2-test-media.cpp(394): num_data_links != num_links
	test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
 drivers/media/usb/uvc/uvc_driver.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 35873cf2773d..76ab6acecbc9 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2163,6 +2163,7 @@ int uvc_register_video_device(struct uvc_device *dev,
 			      const struct v4l2_ioctl_ops *ioctl_ops)
 {
 	int ret;
+	const char *name;
 
 	/* Initialize the video buffers queue. */
 	ret = uvc_queue_init(queue, type, !uvc_no_drop_param);
@@ -2190,16 +2191,20 @@ int uvc_register_video_device(struct uvc_device *dev,
 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
 	default:
 		vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+		name = "Video Capture";
 		break;
 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
 		vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+		name = "Video Output";
 		break;
 	case V4L2_BUF_TYPE_META_CAPTURE:
 		vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;
+		name = "Metadata";
 		break;
 	}
 
-	strscpy(vdev->name, dev->name, sizeof(vdev->name));
+	snprintf(vdev->name, sizeof(vdev->name), "%s %u", name,
+		 stream->header.bTerminalLink);
 
 	/*
 	 * Set the driver data before calling video_register_device, otherwise
-- 
2.31.0.rc2.261.g7f71774620-goog


  parent reply	other threads:[~2021-03-17 16:46 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-17 16:44 [PATCH v6 00/17] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-17 16:44 ` [PATCH v6 01/17] media: v4l2-ioctl: check_ext_ctrls: Fix multiclass V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-18  7:14   ` Hans Verkuil
2021-03-18  7:17     ` Ricardo Ribalda
2021-03-18  7:48       ` Hans Verkuil
2021-03-18  7:49         ` Ricardo Ribalda
2021-03-17 16:44 ` [PATCH v6 02/17] media: v4l2-ioctl: check_ext_ctrls: Return -EINVAL on V4L2_CTRL_WHICH_REQUEST_VAL Ricardo Ribalda
2021-03-17 16:44 ` [PATCH v6 03/17] media: v4l2-ioctl: check_ext_ctrls: Return the right error_idx Ricardo Ribalda
2021-03-17 16:44 ` [PATCH v6 04/17] media: v4l2-ioctl: check_ext_ctrls: Fix V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-17 16:44 ` [PATCH v6 05/17] media: pvrusb2: Do not check for V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-18  7:16   ` Hans Verkuil
2021-03-17 16:45 ` [PATCH v6 06/17] media: uvcvideo: " Ricardo Ribalda
2021-03-18  7:16   ` Hans Verkuil
2021-03-17 16:45 ` [PATCH v6 07/17] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-17 16:45 ` [PATCH v6 08/17] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-17 16:45 ` [PATCH v6 09/17] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-18  7:23   ` Hans Verkuil
2021-03-17 16:45 ` [PATCH v6 10/17] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-17 16:45 ` [PATCH v6 11/17] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-03-18  8:05   ` Hans Verkuil
2021-03-17 16:45 ` Ricardo Ribalda [this message]
2021-03-17 16:45 ` [PATCH v6 13/17] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-03-17 16:45 ` [PATCH v6 14/17] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-03-17 16:45 ` [PATCH v6 15/17] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-03-18  7:27   ` Hans Verkuil
2021-03-17 16:45 ` [PATCH v6 16/17] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-18  7:39   ` Hans Verkuil
2021-03-18  9:09     ` Hans Verkuil
2021-03-17 16:45 ` [PATCH v6 17/17] uvc: use vb2 ioctl and fop helpers Ricardo Ribalda
2021-03-18  9:23 ` [PATCH v6 00/17] uvcvideo: Fix v4l2-compliance errors Hans Verkuil

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=20210317164511.39967-13-ribalda@chromium.org \
    --to=ribalda@chromium.org \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=sergey.senozhatsky@gmail.com \
    --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;
as well as URLs for NNTP newsgroup(s).