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 v8 15/19] media: uvcvideo: Set error_idx during ctrl_commit errors
Date: Fri, 19 Mar 2021 18:09:02 +0100 [thread overview]
Message-ID: <20210319170906.278238-16-ribalda@chromium.org> (raw)
In-Reply-To: <20210319170906.278238-1-ribalda@chromium.org>
If we have an error setting a control, return the affected control in
the error_idx field.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_ctrl.c | 42 ++++++++++++++++++++++++++------
drivers/media/usb/uvc/uvc_v4l2.c | 2 +-
drivers/media/usb/uvc/uvcvideo.h | 10 +++-----
3 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 24fd5afc4e4f..bcebf9d1a46f 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1586,7 +1586,7 @@ int uvc_ctrl_begin(struct uvc_video_chain *chain)
}
static int uvc_ctrl_commit_entity(struct uvc_device *dev,
- struct uvc_entity *entity, int rollback)
+ struct uvc_entity *entity, int rollback, struct uvc_control **err_ctrl)
{
struct uvc_control *ctrl;
unsigned int i;
@@ -1628,31 +1628,59 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
ctrl->dirty = 0;
- if (ret < 0)
+ if (ret < 0) {
+ if (err_ctrl)
+ *err_ctrl = ctrl;
return ret;
+ }
}
return 0;
}
+static int uvc_ctrl_find_ctrlidx(struct uvc_entity *entity,
+ struct v4l2_ext_controls *ctrls,
+ struct uvc_control *uvc_control)
+{
+ struct uvc_control_mapping *mapping;
+ struct uvc_control *ctrl_found;
+ unsigned int i;
+
+ if (!entity)
+ return ctrls->count;
+
+ for (i = 0; i < ctrls->count; i++) {
+ __uvc_find_control(entity, ctrls->controls[i].id, &mapping,
+ &ctrl_found, 0);
+ if (uvc_control == ctrl_found)
+ return i;
+ }
+
+ return ctrls->count;
+}
+
int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count)
+ struct v4l2_ext_controls *ctrls)
{
struct uvc_video_chain *chain = handle->chain;
+ struct uvc_control *err_ctrl;
struct uvc_entity *entity;
int ret = 0;
/* Find the control. */
list_for_each_entry(entity, &chain->entities, chain) {
- ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback);
+ ret = uvc_ctrl_commit_entity(chain->dev, entity, rollback,
+ &err_ctrl);
if (ret < 0)
goto done;
}
if (!rollback)
- uvc_ctrl_send_events(handle, xctrls, xctrls_count);
+ uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
done:
+ if (ret < 0 && ctrls)
+ ctrls->error_idx = uvc_ctrl_find_ctrlidx(entity, ctrls,
+ err_ctrl);
mutex_unlock(&chain->ctrl_mutex);
return ret;
}
@@ -2110,7 +2138,7 @@ int uvc_ctrl_restore_values(struct uvc_device *dev)
ctrl->dirty = 1;
}
- ret = uvc_ctrl_commit_entity(dev, entity, 0);
+ ret = uvc_ctrl_commit_entity(dev, entity, 0, NULL);
if (ret < 0)
return ret;
}
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index a3ee1dc003fc..8d8b12a4db34 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1088,7 +1088,7 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle,
ctrls->error_idx = 0;
if (ioctl == VIDIOC_S_EXT_CTRLS)
- return uvc_ctrl_commit(handle, ctrls->controls, ctrls->count);
+ return uvc_ctrl_commit(handle, ctrls);
else
return uvc_ctrl_rollback(handle);
}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 9471c342a310..0313b30f0cea 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -887,17 +887,15 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain,
int uvc_ctrl_begin(struct uvc_video_chain *chain);
int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count);
+ struct v4l2_ext_controls *ctrls);
static inline int uvc_ctrl_commit(struct uvc_fh *handle,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count)
+ struct v4l2_ext_controls *ctrls)
{
- return __uvc_ctrl_commit(handle, 0, xctrls, xctrls_count);
+ return __uvc_ctrl_commit(handle, 0, ctrls);
}
static inline int uvc_ctrl_rollback(struct uvc_fh *handle)
{
- return __uvc_ctrl_commit(handle, 1, NULL, 0);
+ return __uvc_ctrl_commit(handle, 1, NULL);
}
int uvc_ctrl_get(struct uvc_video_chain *chain, struct v4l2_ext_control *xctrl);
--
2.31.0.rc2.261.g7f71774620-goog
next prev parent reply other threads:[~2021-03-19 17:10 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 17:08 [PATCH v8 00/19] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 01/19] media: v4l2-ioctl: Fix check_ext_ctrls Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 02/19] media: pvrusb2: Do not check for V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 03/19] media: uvcvideo: " Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 04/19] media: v4l2-ioctl: S_CTRL output the right value Ricardo Ribalda
2021-03-20 7:24 ` Hans Verkuil
2021-03-19 17:08 ` [PATCH v8 05/19] media: uvcvideo: Remove s_ctrl and g_ctrl Ricardo Ribalda
2021-03-20 7:25 ` Hans Verkuil
2021-03-19 17:08 ` [PATCH v8 06/19] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 07/19] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 08/19] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 09/19] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 10/19] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 11/19] media: uvcvideo: Set unique vdev name based in type Ricardo Ribalda
2021-03-19 17:08 ` [PATCH v8 12/19] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-03-19 17:09 ` [PATCH v8 13/19] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-03-19 17:09 ` [PATCH v8 14/19] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-03-19 17:09 ` Ricardo Ribalda [this message]
2021-03-20 7:27 ` [PATCH v8 15/19] media: uvcvideo: Set error_idx during ctrl_commit errors Hans Verkuil
2021-03-19 17:09 ` [PATCH v8 16/19] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-19 17:09 ` [PATCH v8 17/19] media: docs: Document the behaviour of uvcdriver Ricardo Ribalda
2021-03-19 17:09 ` [PATCH v8 18/19] media: uvcvideo: Downgrade control error messages Ricardo Ribalda
2021-03-19 17:09 ` [PATCH v8 19/19] uvc: use vb2 ioctl and fop helpers 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=20210319170906.278238-16-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).