* [PATCH v2 0/2] media: uvcvideo: Drop one lock
@ 2025-07-25 13:12 Ricardo Ribalda
2025-07-25 13:12 ` [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex Ricardo Ribalda
2025-07-25 13:12 ` [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue Ricardo Ribalda
0 siblings, 2 replies; 5+ messages in thread
From: Ricardo Ribalda @ 2025-07-25 13:12 UTC (permalink / raw)
To: Laurent Pinchart, Hans de Goede, Mauro Carvalho Chehab
Cc: linux-media, linux-kernel, Ricardo Ribalda
This is a follow-up patch for
https://git.linuxtv.org/media.git/commit/drivers/media/usb/uvc?id=c93d73c9c2cfa7658f7100d201a47c4856746222
media: uvcvideo: Use vb2 ioctl and fop helpers
Use this opportunity to refactor some more code.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
Changes in v2:
- CodeStyle
- Link to v1: https://lore.kernel.org/r/20250717-uvc-onelocksless-v1-1-91a1b834186a@chromium.org
---
Ricardo Ribalda (2):
media: uvcvideo: Drop stream->mutex
media: uvcvideo: Move video_device under video_queue
drivers/media/usb/uvc/uvc_driver.c | 20 +++++++----------
drivers/media/usb/uvc/uvc_metadata.c | 13 ++++-------
drivers/media/usb/uvc/uvc_v4l2.c | 43 ++++++++----------------------------
drivers/media/usb/uvc/uvc_video.c | 2 +-
drivers/media/usb/uvc/uvcvideo.h | 10 +--------
5 files changed, 23 insertions(+), 65 deletions(-)
---
base-commit: d968e50b5c26642754492dea23cbd3592bde62d8
change-id: 20250716-uvc-onelocksless-b66658e01f89
Best regards,
--
Ricardo Ribalda <ribalda@chromium.org>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex 2025-07-25 13:12 [PATCH v2 0/2] media: uvcvideo: Drop one lock Ricardo Ribalda @ 2025-07-25 13:12 ` Ricardo Ribalda 2025-09-08 9:14 ` Laurent Pinchart 2025-07-25 13:12 ` [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue Ricardo Ribalda 1 sibling, 1 reply; 5+ messages in thread From: Ricardo Ribalda @ 2025-07-25 13:12 UTC (permalink / raw) To: Laurent Pinchart, Hans de Goede, Mauro Carvalho Chehab Cc: linux-media, linux-kernel, Ricardo Ribalda Since commit c93d73c9c2cf ("media: uvcvideo: Use vb2 ioctl and fop helpers"), the IOCTLs are serialized. Due to this there is no more need to protect ctrl, cur_format or cur_frame from concurrent access. Drop stream->mutex after thanking it for years of good service. Use this opportunity to do fix some CodeStyle. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_driver.c | 4 ---- drivers/media/usb/uvc/uvc_metadata.c | 10 +++------ drivers/media/usb/uvc/uvc_v4l2.c | 41 +++++++----------------------------- drivers/media/usb/uvc/uvcvideo.h | 6 ------ 4 files changed, 11 insertions(+), 50 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 775bede0d93d9b3e5391914aa395326d3de6a3b1..3039e6a533b82dd917050d416c9ced8756d69170 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -183,8 +183,6 @@ static void uvc_stream_delete(struct uvc_streaming *stream) if (stream->async_wq) destroy_workqueue(stream->async_wq); - mutex_destroy(&stream->mutex); - usb_put_intf(stream->intf); kfree(stream->formats); @@ -201,8 +199,6 @@ static struct uvc_streaming *uvc_stream_new(struct uvc_device *dev, if (stream == NULL) return NULL; - mutex_init(&stream->mutex); - stream->dev = dev; stream->intf = usb_get_intf(intf); stream->intfnum = intf->cur_altsetting->desc.bInterfaceNumber; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c index 229e08ff323eed9129d835b24ea2e8085bb713b8..649844e2ad60ed9e9951daec871f2000f48702a6 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -100,16 +100,12 @@ static int uvc_meta_v4l2_set_format(struct file *file, void *fh, * Metadata buffers would still be perfectly parseable, but it's more * consistent and cleaner to disallow that. */ - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->meta.queue.queue)) - ret = -EBUSY; - else - stream->meta.format = fmt->dataformat; + return -EBUSY; - mutex_unlock(&stream->mutex); + stream->meta.format = fmt->dataformat; - return ret; + return 0; } static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 160f9cf6e6dbdbf39e3eff56a5d5ea1d977fbe22..fdc4520a7bb42af7cd5cb9c1fa49957c31e0041c 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -329,14 +329,12 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream, * developers test their webcams with the Linux driver as well as with * the Windows driver). */ - mutex_lock(&stream->mutex); if (stream->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) probe->dwMaxVideoFrameSize = stream->ctrl.dwMaxVideoFrameSize; /* Probe the device. */ ret = uvc_probe_video(stream, probe); - mutex_unlock(&stream->mutex); if (ret < 0) return ret; @@ -395,19 +393,15 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, struct uvc_streaming *stream = handle->stream; const struct uvc_format *format; const struct uvc_frame *frame; - int ret = 0; if (fmt->type != stream->type) return -EINVAL; - mutex_lock(&stream->mutex); format = stream->cur_format; frame = stream->cur_frame; - if (format == NULL || frame == NULL) { - ret = -EINVAL; - goto done; - } + if (!format || !frame) + return -EINVAL; fmt->fmt.pix.pixelformat = format->fcc; fmt->fmt.pix.width = frame->wWidth; @@ -419,9 +413,7 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, fmt->fmt.pix.xfer_func = format->xfer_func; fmt->fmt.pix.ycbcr_enc = format->ycbcr_enc; -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } static int uvc_ioctl_s_fmt(struct file *file, void *fh, @@ -441,19 +433,14 @@ static int uvc_ioctl_s_fmt(struct file *file, void *fh, if (ret < 0) return ret; - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->queue.queue)) { - ret = -EBUSY; - goto done; - } + if (vb2_is_busy(&stream->queue.queue)) + return -EBUSY; stream->ctrl = probe; stream->cur_format = format; stream->cur_frame = frame; -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } static int uvc_ioctl_g_parm(struct file *file, void *fh, @@ -466,10 +453,7 @@ static int uvc_ioctl_g_parm(struct file *file, void *fh, if (parm->type != stream->type) return -EINVAL; - mutex_lock(&stream->mutex); numerator = stream->ctrl.dwFrameInterval; - mutex_unlock(&stream->mutex); - denominator = 10000000; v4l2_simplify_fraction(&numerator, &denominator, 8, 333); @@ -519,12 +503,8 @@ static int uvc_ioctl_s_parm(struct file *file, void *fh, uvc_dbg(stream->dev, FORMAT, "Setting frame interval to %u/%u (%u)\n", timeperframe.numerator, timeperframe.denominator, interval); - mutex_lock(&stream->mutex); - - if (uvc_queue_streaming(&stream->queue)) { - mutex_unlock(&stream->mutex); + if (uvc_queue_streaming(&stream->queue)) return -EBUSY; - } format = stream->cur_format; frame = stream->cur_frame; @@ -556,14 +536,11 @@ static int uvc_ioctl_s_parm(struct file *file, void *fh, /* Probe the device with the new settings. */ ret = uvc_probe_video(stream, &probe); - if (ret < 0) { - mutex_unlock(&stream->mutex); + if (ret < 0) return ret; - } stream->ctrl = probe; stream->cur_frame = frame; - mutex_unlock(&stream->mutex); /* Return the actual frame period. */ timeperframe.numerator = probe.dwFrameInterval; @@ -941,10 +918,8 @@ static int uvc_ioctl_g_selection(struct file *file, void *fh, sel->r.left = 0; sel->r.top = 0; - mutex_lock(&stream->mutex); sel->r.width = stream->cur_frame->wWidth; sel->r.height = stream->cur_frame->wHeight; - mutex_unlock(&stream->mutex); return 0; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 757254fc4fe930ae61c9d0425f04d4cd074a617e..86765b9d7935f0888476249c3fb826cd7f36b35c 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -469,12 +469,6 @@ struct uvc_streaming { const struct uvc_format *cur_format; const struct uvc_frame *cur_frame; - /* - * Protect access to ctrl, cur_format, cur_frame and hardware video - * probe control. - */ - struct mutex mutex; - /* Buffers queue. */ unsigned int frozen : 1; struct uvc_video_queue queue; -- 2.50.1.470.g6ba607880d-goog ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex 2025-07-25 13:12 ` [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex Ricardo Ribalda @ 2025-09-08 9:14 ` Laurent Pinchart 0 siblings, 0 replies; 5+ messages in thread From: Laurent Pinchart @ 2025-09-08 9:14 UTC (permalink / raw) To: Ricardo Ribalda Cc: Hans de Goede, Mauro Carvalho Chehab, linux-media, linux-kernel Hi Ricardo, Thank you for the patch. On Fri, Jul 25, 2025 at 01:12:48PM +0000, Ricardo Ribalda wrote: > Since commit c93d73c9c2cf ("media: uvcvideo: Use vb2 ioctl and fop > helpers"), the IOCTLs are serialized. Due to this there is no more need > to protect ctrl, cur_format or cur_frame from concurrent access. > > Drop stream->mutex after thanking it for years of good service. > > Use this opportunity to do fix some CodeStyle. > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 4 ---- > drivers/media/usb/uvc/uvc_metadata.c | 10 +++------ > drivers/media/usb/uvc/uvc_v4l2.c | 41 +++++++----------------------------- > drivers/media/usb/uvc/uvcvideo.h | 6 ------ > 4 files changed, 11 insertions(+), 50 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 775bede0d93d9b3e5391914aa395326d3de6a3b1..3039e6a533b82dd917050d416c9ced8756d69170 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -183,8 +183,6 @@ static void uvc_stream_delete(struct uvc_streaming *stream) > if (stream->async_wq) > destroy_workqueue(stream->async_wq); > > - mutex_destroy(&stream->mutex); > - > usb_put_intf(stream->intf); > > kfree(stream->formats); > @@ -201,8 +199,6 @@ static struct uvc_streaming *uvc_stream_new(struct uvc_device *dev, > if (stream == NULL) > return NULL; > > - mutex_init(&stream->mutex); > - > stream->dev = dev; > stream->intf = usb_get_intf(intf); > stream->intfnum = intf->cur_altsetting->desc.bInterfaceNumber; > diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c > index 229e08ff323eed9129d835b24ea2e8085bb713b8..649844e2ad60ed9e9951daec871f2000f48702a6 100644 > --- a/drivers/media/usb/uvc/uvc_metadata.c > +++ b/drivers/media/usb/uvc/uvc_metadata.c > @@ -100,16 +100,12 @@ static int uvc_meta_v4l2_set_format(struct file *file, void *fh, > * Metadata buffers would still be perfectly parseable, but it's more > * consistent and cleaner to disallow that. > */ > - mutex_lock(&stream->mutex); > - > if (vb2_is_busy(&stream->meta.queue.queue)) > - ret = -EBUSY; > - else > - stream->meta.format = fmt->dataformat; > + return -EBUSY; > > - mutex_unlock(&stream->mutex); > + stream->meta.format = fmt->dataformat; > > - return ret; > + return 0; > } > > static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c > index 160f9cf6e6dbdbf39e3eff56a5d5ea1d977fbe22..fdc4520a7bb42af7cd5cb9c1fa49957c31e0041c 100644 > --- a/drivers/media/usb/uvc/uvc_v4l2.c > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > @@ -329,14 +329,12 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream, > * developers test their webcams with the Linux driver as well as with > * the Windows driver). > */ > - mutex_lock(&stream->mutex); > if (stream->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) > probe->dwMaxVideoFrameSize = > stream->ctrl.dwMaxVideoFrameSize; > > /* Probe the device. */ > ret = uvc_probe_video(stream, probe); > - mutex_unlock(&stream->mutex); > if (ret < 0) > return ret; > > @@ -395,19 +393,15 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, > struct uvc_streaming *stream = handle->stream; > const struct uvc_format *format; > const struct uvc_frame *frame; > - int ret = 0; > > if (fmt->type != stream->type) > return -EINVAL; > > - mutex_lock(&stream->mutex); > format = stream->cur_format; > frame = stream->cur_frame; > > - if (format == NULL || frame == NULL) { > - ret = -EINVAL; > - goto done; > - } > + if (!format || !frame) > + return -EINVAL; > > fmt->fmt.pix.pixelformat = format->fcc; > fmt->fmt.pix.width = frame->wWidth; > @@ -419,9 +413,7 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, > fmt->fmt.pix.xfer_func = format->xfer_func; > fmt->fmt.pix.ycbcr_enc = format->ycbcr_enc; > > -done: > - mutex_unlock(&stream->mutex); > - return ret; > + return 0; > } > > static int uvc_ioctl_s_fmt(struct file *file, void *fh, > @@ -441,19 +433,14 @@ static int uvc_ioctl_s_fmt(struct file *file, void *fh, > if (ret < 0) > return ret; > > - mutex_lock(&stream->mutex); > - if (vb2_is_busy(&stream->queue.queue)) { > - ret = -EBUSY; > - goto done; > - } > + if (vb2_is_busy(&stream->queue.queue)) > + return -EBUSY; > > stream->ctrl = probe; > stream->cur_format = format; > stream->cur_frame = frame; > > -done: > - mutex_unlock(&stream->mutex); > - return ret; > + return 0; > } > > static int uvc_ioctl_g_parm(struct file *file, void *fh, > @@ -466,10 +453,7 @@ static int uvc_ioctl_g_parm(struct file *file, void *fh, > if (parm->type != stream->type) > return -EINVAL; > > - mutex_lock(&stream->mutex); > numerator = stream->ctrl.dwFrameInterval; > - mutex_unlock(&stream->mutex); > - > denominator = 10000000; > v4l2_simplify_fraction(&numerator, &denominator, 8, 333); > > @@ -519,12 +503,8 @@ static int uvc_ioctl_s_parm(struct file *file, void *fh, > uvc_dbg(stream->dev, FORMAT, "Setting frame interval to %u/%u (%u)\n", > timeperframe.numerator, timeperframe.denominator, interval); > > - mutex_lock(&stream->mutex); > - > - if (uvc_queue_streaming(&stream->queue)) { > - mutex_unlock(&stream->mutex); > + if (uvc_queue_streaming(&stream->queue)) > return -EBUSY; > - } > > format = stream->cur_format; > frame = stream->cur_frame; > @@ -556,14 +536,11 @@ static int uvc_ioctl_s_parm(struct file *file, void *fh, > > /* Probe the device with the new settings. */ > ret = uvc_probe_video(stream, &probe); > - if (ret < 0) { > - mutex_unlock(&stream->mutex); > + if (ret < 0) > return ret; > - } > > stream->ctrl = probe; > stream->cur_frame = frame; > - mutex_unlock(&stream->mutex); > > /* Return the actual frame period. */ > timeperframe.numerator = probe.dwFrameInterval; > @@ -941,10 +918,8 @@ static int uvc_ioctl_g_selection(struct file *file, void *fh, > > sel->r.left = 0; > sel->r.top = 0; > - mutex_lock(&stream->mutex); > sel->r.width = stream->cur_frame->wWidth; > sel->r.height = stream->cur_frame->wHeight; > - mutex_unlock(&stream->mutex); > > return 0; > } > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 757254fc4fe930ae61c9d0425f04d4cd074a617e..86765b9d7935f0888476249c3fb826cd7f36b35c 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -469,12 +469,6 @@ struct uvc_streaming { > const struct uvc_format *cur_format; > const struct uvc_frame *cur_frame; > > - /* > - * Protect access to ctrl, cur_format, cur_frame and hardware video > - * probe control. > - */ > - struct mutex mutex; > - > /* Buffers queue. */ > unsigned int frozen : 1; > struct uvc_video_queue queue; -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue 2025-07-25 13:12 [PATCH v2 0/2] media: uvcvideo: Drop one lock Ricardo Ribalda 2025-07-25 13:12 ` [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex Ricardo Ribalda @ 2025-07-25 13:12 ` Ricardo Ribalda 2025-09-08 9:18 ` Laurent Pinchart 1 sibling, 1 reply; 5+ messages in thread From: Ricardo Ribalda @ 2025-07-25 13:12 UTC (permalink / raw) To: Laurent Pinchart, Hans de Goede, Mauro Carvalho Chehab Cc: linux-media, linux-kernel, Ricardo Ribalda It is more natural that the "struct video_device" belongs to uvc_video_queue instead of uvc_streaming. This is an aesthetic change. No functional change expected. Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_driver.c | 16 ++++++++-------- drivers/media/usb/uvc/uvc_metadata.c | 3 +-- drivers/media/usb/uvc/uvc_v4l2.c | 2 +- drivers/media/usb/uvc/uvc_video.c | 2 +- drivers/media/usb/uvc/uvcvideo.h | 4 +--- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 3039e6a533b82dd917050d416c9ced8756d69170..505e85a6b4d99666f3a4a9441dd1ca72e13228e0 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1954,11 +1954,11 @@ static void uvc_unregister_video(struct uvc_device *dev) list_for_each_entry(stream, &dev->streams, list) { /* Nothing to do here, continue. */ - if (!video_is_registered(&stream->vdev)) + if (!video_is_registered(&stream->queue.vdev)) continue; - vb2_video_unregister_device(&stream->vdev); - vb2_video_unregister_device(&stream->meta.vdev); + vb2_video_unregister_device(&stream->queue.vdev); + vb2_video_unregister_device(&stream->meta.queue.vdev); /* * Now both vdevs are not streaming and all the ioctls will @@ -1980,12 +1980,12 @@ static void uvc_unregister_video(struct uvc_device *dev) int uvc_register_video_device(struct uvc_device *dev, struct uvc_streaming *stream, - struct video_device *vdev, struct uvc_video_queue *queue, enum v4l2_buf_type type, const struct v4l2_file_operations *fops, const struct v4l2_ioctl_ops *ioctl_ops) { + struct video_device *vdev = &queue->vdev; int ret; /* Initialize the video buffers queue. */ @@ -2067,9 +2067,9 @@ static int uvc_register_video(struct uvc_device *dev, uvc_debugfs_init_stream(stream); /* Register the device with V4L. */ - return uvc_register_video_device(dev, stream, &stream->vdev, - &stream->queue, stream->type, - &uvc_fops, &uvc_ioctl_ops); + return uvc_register_video_device(dev, stream, &stream->queue, + stream->type, &uvc_fops, + &uvc_ioctl_ops); } /* @@ -2105,7 +2105,7 @@ static int uvc_register_terms(struct uvc_device *dev, */ uvc_meta_register(stream); - term->vdev = &stream->vdev; + term->vdev = &stream->queue.vdev; } return 0; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c index 649844e2ad60ed9e9951daec871f2000f48702a6..9ed50c3249cbd222be71ffdba18c41ff972158af 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -228,12 +228,11 @@ static int uvc_meta_detect_msxu(struct uvc_device *dev) int uvc_meta_register(struct uvc_streaming *stream) { struct uvc_device *dev = stream->dev; - struct video_device *vdev = &stream->meta.vdev; struct uvc_video_queue *queue = &stream->meta.queue; stream->meta.format = V4L2_META_FMT_UVC; - return uvc_register_video_device(dev, stream, vdev, queue, + return uvc_register_video_device(dev, stream, queue, V4L2_BUF_TYPE_META_CAPTURE, &uvc_meta_fops, &uvc_meta_ioctl_ops); } diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index fdc4520a7bb42af7cd5cb9c1fa49957c31e0041c..5b0a7edc9966e7c66438af6daa1f98fa87a6d0d3 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -576,7 +576,7 @@ static int uvc_v4l2_open(struct file *file) if (!handle) return -ENOMEM; - v4l2_fh_init(&handle->vfh, &stream->vdev); + v4l2_fh_init(&handle->vfh, &stream->queue.vdev); v4l2_fh_add(&handle->vfh); handle->chain = stream->chain; handle->stream = stream; diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 2e377e7b9e81599aca19b800a171cc16a09c1e8a..ef12a935829277d7f1c1ebffcd901742513fbe7e 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1705,7 +1705,7 @@ static void uvc_video_complete(struct urb *urb) struct uvc_streaming *stream = uvc_urb->stream; struct uvc_video_queue *queue = &stream->queue; struct uvc_video_queue *qmeta = &stream->meta.queue; - struct vb2_queue *vb2_qmeta = stream->meta.vdev.queue; + struct vb2_queue *vb2_qmeta = stream->meta.queue.vdev.queue; struct uvc_buffer *buf = NULL; struct uvc_buffer *buf_meta = NULL; unsigned long flags; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 86765b9d7935f0888476249c3fb826cd7f36b35c..d4947878fd0126d788d16977a553fa0f45645dcd 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -328,6 +328,7 @@ struct uvc_buffer { #define UVC_QUEUE_DISCONNECTED (1 << 0) struct uvc_video_queue { + struct video_device vdev; struct vb2_queue queue; struct mutex mutex; /* * Serializes vb2_queue and @@ -450,7 +451,6 @@ struct uvc_urb { struct uvc_streaming { struct list_head list; struct uvc_device *dev; - struct video_device vdev; struct uvc_video_chain *chain; atomic_t active; @@ -477,7 +477,6 @@ struct uvc_streaming { struct uvc_buffer *meta_buf); struct { - struct video_device vdev; struct uvc_video_queue queue; u32 format; } meta; @@ -727,7 +726,6 @@ int uvc_meta_register(struct uvc_streaming *stream); int uvc_register_video_device(struct uvc_device *dev, struct uvc_streaming *stream, - struct video_device *vdev, struct uvc_video_queue *queue, enum v4l2_buf_type type, const struct v4l2_file_operations *fops, -- 2.50.1.470.g6ba607880d-goog ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue 2025-07-25 13:12 ` [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue Ricardo Ribalda @ 2025-09-08 9:18 ` Laurent Pinchart 0 siblings, 0 replies; 5+ messages in thread From: Laurent Pinchart @ 2025-09-08 9:18 UTC (permalink / raw) To: Ricardo Ribalda Cc: Hans de Goede, Mauro Carvalho Chehab, linux-media, linux-kernel Hi Ricardo, On Fri, Jul 25, 2025 at 01:12:49PM +0000, Ricardo Ribalda wrote: > It is more natural that the "struct video_device" belongs to > uvc_video_queue instead of uvc_streaming. > > This is an aesthetic change. No functional change expected. > > Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_driver.c | 16 ++++++++-------- > drivers/media/usb/uvc/uvc_metadata.c | 3 +-- > drivers/media/usb/uvc/uvc_v4l2.c | 2 +- > drivers/media/usb/uvc/uvc_video.c | 2 +- > drivers/media/usb/uvc/uvcvideo.h | 4 +--- > 5 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 3039e6a533b82dd917050d416c9ced8756d69170..505e85a6b4d99666f3a4a9441dd1ca72e13228e0 100644 > --- a/drivers/media/usb/uvc/uvc_driver.c > +++ b/drivers/media/usb/uvc/uvc_driver.c > @@ -1954,11 +1954,11 @@ static void uvc_unregister_video(struct uvc_device *dev) > > list_for_each_entry(stream, &dev->streams, list) { > /* Nothing to do here, continue. */ > - if (!video_is_registered(&stream->vdev)) > + if (!video_is_registered(&stream->queue.vdev)) > continue; > > - vb2_video_unregister_device(&stream->vdev); > - vb2_video_unregister_device(&stream->meta.vdev); > + vb2_video_unregister_device(&stream->queue.vdev); > + vb2_video_unregister_device(&stream->meta.queue.vdev); > > /* > * Now both vdevs are not streaming and all the ioctls will > @@ -1980,12 +1980,12 @@ static void uvc_unregister_video(struct uvc_device *dev) > > int uvc_register_video_device(struct uvc_device *dev, > struct uvc_streaming *stream, > - struct video_device *vdev, > struct uvc_video_queue *queue, > enum v4l2_buf_type type, > const struct v4l2_file_operations *fops, > const struct v4l2_ioctl_ops *ioctl_ops) > { > + struct video_device *vdev = &queue->vdev; > int ret; > > /* Initialize the video buffers queue. */ > @@ -2067,9 +2067,9 @@ static int uvc_register_video(struct uvc_device *dev, > uvc_debugfs_init_stream(stream); > > /* Register the device with V4L. */ > - return uvc_register_video_device(dev, stream, &stream->vdev, > - &stream->queue, stream->type, > - &uvc_fops, &uvc_ioctl_ops); > + return uvc_register_video_device(dev, stream, &stream->queue, > + stream->type, &uvc_fops, > + &uvc_ioctl_ops); > } > > /* > @@ -2105,7 +2105,7 @@ static int uvc_register_terms(struct uvc_device *dev, > */ > uvc_meta_register(stream); > > - term->vdev = &stream->vdev; > + term->vdev = &stream->queue.vdev; > } > > return 0; > diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c > index 649844e2ad60ed9e9951daec871f2000f48702a6..9ed50c3249cbd222be71ffdba18c41ff972158af 100644 > --- a/drivers/media/usb/uvc/uvc_metadata.c > +++ b/drivers/media/usb/uvc/uvc_metadata.c > @@ -228,12 +228,11 @@ static int uvc_meta_detect_msxu(struct uvc_device *dev) > int uvc_meta_register(struct uvc_streaming *stream) > { > struct uvc_device *dev = stream->dev; > - struct video_device *vdev = &stream->meta.vdev; > struct uvc_video_queue *queue = &stream->meta.queue; > > stream->meta.format = V4L2_META_FMT_UVC; > > - return uvc_register_video_device(dev, stream, vdev, queue, > + return uvc_register_video_device(dev, stream, queue, > V4L2_BUF_TYPE_META_CAPTURE, > &uvc_meta_fops, &uvc_meta_ioctl_ops); > } > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c > index fdc4520a7bb42af7cd5cb9c1fa49957c31e0041c..5b0a7edc9966e7c66438af6daa1f98fa87a6d0d3 100644 > --- a/drivers/media/usb/uvc/uvc_v4l2.c > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > @@ -576,7 +576,7 @@ static int uvc_v4l2_open(struct file *file) > if (!handle) > return -ENOMEM; > > - v4l2_fh_init(&handle->vfh, &stream->vdev); > + v4l2_fh_init(&handle->vfh, &stream->queue.vdev); > v4l2_fh_add(&handle->vfh); > handle->chain = stream->chain; > handle->stream = stream; > diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c > index 2e377e7b9e81599aca19b800a171cc16a09c1e8a..ef12a935829277d7f1c1ebffcd901742513fbe7e 100644 > --- a/drivers/media/usb/uvc/uvc_video.c > +++ b/drivers/media/usb/uvc/uvc_video.c > @@ -1705,7 +1705,7 @@ static void uvc_video_complete(struct urb *urb) > struct uvc_streaming *stream = uvc_urb->stream; > struct uvc_video_queue *queue = &stream->queue; > struct uvc_video_queue *qmeta = &stream->meta.queue; > - struct vb2_queue *vb2_qmeta = stream->meta.vdev.queue; > + struct vb2_queue *vb2_qmeta = stream->meta.queue.vdev.queue; > struct uvc_buffer *buf = NULL; > struct uvc_buffer *buf_meta = NULL; > unsigned long flags; > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 86765b9d7935f0888476249c3fb826cd7f36b35c..d4947878fd0126d788d16977a553fa0f45645dcd 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -328,6 +328,7 @@ struct uvc_buffer { > #define UVC_QUEUE_DISCONNECTED (1 << 0) > > struct uvc_video_queue { > + struct video_device vdev; > struct vb2_queue queue; > struct mutex mutex; /* > * Serializes vb2_queue and > @@ -450,7 +451,6 @@ struct uvc_urb { > struct uvc_streaming { > struct list_head list; > struct uvc_device *dev; > - struct video_device vdev; > struct uvc_video_chain *chain; > atomic_t active; > > @@ -477,7 +477,6 @@ struct uvc_streaming { > struct uvc_buffer *meta_buf); > > struct { > - struct video_device vdev; > struct uvc_video_queue queue; > u32 format; > } meta; > @@ -727,7 +726,6 @@ int uvc_meta_register(struct uvc_streaming *stream); > > int uvc_register_video_device(struct uvc_device *dev, > struct uvc_streaming *stream, > - struct video_device *vdev, > struct uvc_video_queue *queue, > enum v4l2_buf_type type, > const struct v4l2_file_operations *fops, -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-09-08 9:18 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2025-07-25 13:12 [PATCH v2 0/2] media: uvcvideo: Drop one lock Ricardo Ribalda 2025-07-25 13:12 ` [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex Ricardo Ribalda 2025-09-08 9:14 ` Laurent Pinchart 2025-07-25 13:12 ` [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue Ricardo Ribalda 2025-09-08 9:18 ` Laurent Pinchart
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®