From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v6 04/11] media: uvcvideo: Add uvc_ctrl_status_event_direct
Date: Wed, 23 Dec 2020 00:04:39 +0100 [thread overview]
Message-ID: <20201222230446.1027916-5-ribalda@chromium.org> (raw)
In-Reply-To: <20201222230446.1027916-1-ribalda@chromium.org>
Provide a code path for events that can be sent without a work-queue,
this is, that do not belong to an URB and are not handled in the top
half on an irq-handled.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_ctrl.c | 35 +++++++++++++++++++++++++++-----
drivers/media/usb/uvc/uvcvideo.h | 2 ++
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 9f6174a10e73..5fe228a3213b 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1254,17 +1254,14 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain,
uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes);
}
-static void uvc_ctrl_status_event_work(struct work_struct *work)
+static void __uvc_ctrl_status_event(struct uvc_device *dev,
+ struct uvc_ctrl_work *w)
{
- struct uvc_device *dev = container_of(work, struct uvc_device,
- async_ctrl.work);
- struct uvc_ctrl_work *w = &dev->async_ctrl;
struct uvc_video_chain *chain = w->chain;
struct uvc_control_mapping *mapping;
struct uvc_control *ctrl = w->ctrl;
struct uvc_fh *handle;
unsigned int i;
- int ret;
mutex_lock(&chain->ctrl_mutex);
@@ -1291,6 +1288,16 @@ static void uvc_ctrl_status_event_work(struct work_struct *work)
}
mutex_unlock(&chain->ctrl_mutex);
+}
+
+static void uvc_ctrl_status_event_work(struct work_struct *work)
+{
+ struct uvc_device *dev = container_of(work, struct uvc_device,
+ async_ctrl.work);
+ struct uvc_ctrl_work *w = &dev->async_ctrl;
+ int ret;
+
+ __uvc_ctrl_status_event(dev, w);
/* Resubmit the URB. */
w->urb->interval = dev->int_ep->desc.bInterval;
@@ -1321,6 +1328,24 @@ bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,
return true;
}
+void uvc_ctrl_status_event_direct(struct uvc_video_chain *chain,
+ struct uvc_control *ctrl, const u8 *data)
+{
+ struct uvc_device *dev = chain->dev;
+ struct uvc_ctrl_work w;
+
+ if (list_empty(&ctrl->info.mappings)) {
+ ctrl->handle = NULL;
+ return;
+ }
+
+ w.data = data;
+ w.chain = chain;
+ w.ctrl = ctrl;
+
+ __uvc_ctrl_status_event(dev, &w);
+}
+
static bool uvc_ctrl_xctrls_has_control(const struct v4l2_ext_control *xctrls,
unsigned int xctrls_count, u32 id)
{
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index c50b0546901f..d7954dcc2b60 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -845,6 +845,8 @@ void uvc_ctrl_cleanup_device(struct uvc_device *dev);
int uvc_ctrl_restore_values(struct uvc_device *dev);
bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain,
struct uvc_control *ctrl, const u8 *data);
+void uvc_ctrl_status_event_direct(struct uvc_video_chain *chain,
+ struct uvc_control *ctrl, const u8 *data);
int uvc_ctrl_begin(struct uvc_video_chain *chain);
int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
--
2.29.2.729.g45daf8777d-goog
next prev parent reply other threads:[~2020-12-22 23:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 23:04 [PATCH v6 00/11] Show privacy_gpio as a v4l2_ctrl Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 01/11] media: uvcvideo: Move guid to entity Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 02/11] media: uvcvideo: Allow extra entities Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 03/11] media: uvcvideo: Allow entities with no pads Ricardo Ribalda
2020-12-22 23:04 ` Ricardo Ribalda [this message]
2020-12-23 8:53 ` [PATCH v6 04/11] media: uvcvideo: Add uvc_ctrl_status_event_direct Laurent Pinchart
2020-12-22 23:04 ` [PATCH v6 05/11] media: uvcvideo: Allow entity-defined get_info and get_cur Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 06/11] media: uvcvideo: Implement UVC_EXT_GPIO_UNIT Ricardo Ribalda
2020-12-23 11:15 ` Laurent Pinchart
2020-12-22 23:04 ` [PATCH v6 07/11] media: uvcvideo: Add Privacy control based on EXT_GPIO Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 08/11] media: uvcvideo: Implement UVC_QUIRK_PRIVACY_DURING_STREAM Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 09/11] media: uvcvideo: Use dev_ printk aliases Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 10/11] media: uvcvideo: New macro uvc_trace_cont Ricardo Ribalda
2020-12-22 23:04 ` [PATCH v6 11/11] media: uvcvideo: use dev_printk() for uvc_trace() Ricardo Ribalda
2020-12-23 11:29 ` Joe Perches
2020-12-23 13:39 ` Ricardo Ribalda
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=20201222230446.1027916-5-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.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).