niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

media: v4l2-ctrls: show all owned controls in log_status

Browse source 
VIDIOC_LOG_STATUS will log the controls owned by the driver. But the
code didn't take into account the case where a single driver creates
multiple control handlers. A good example is the vivid driver, but
others use it as well.

Modify v4l2_ctrl_handler_log_status() so that it really shows all
controls owned by this driver.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Hans Verkuil 2024-01-17 15:52:04 +01:00
parent 8674fd635f
commit 9801b5b28c
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/media/v4l2-core/v4l2-ctrls-core.c
View file

@ -2503,7 +2503,8 @@ int v4l2_ctrl_handler_setup(struct v4l2_ctrl_handler *hdl)
EXPORT_SYMBOL(v4l2_ctrl_handler_setup); EXPORT_SYMBOL(v4l2_ctrl_handler_setup);
/* Log the control name and value */ /* Log the control name and value */
static void log_ctrl(const struct v4l2_ctrl *ctrl, static void log_ctrl(const struct v4l2_ctrl_handler *hdl,
struct v4l2_ctrl *ctrl,
const char *prefix, const char *colon) const char *prefix, const char *colon)
{ {
if (ctrl->flags & (V4L2_CTRL_FLAG_DISABLED | V4L2_CTRL_FLAG_WRITE_ONLY)) if (ctrl->flags & (V4L2_CTRL_FLAG_DISABLED | V4L2_CTRL_FLAG_WRITE_ONLY))
@ -2513,7 +2514,11 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
pr_info("%s%s%s: ", prefix, colon, ctrl->name); pr_info("%s%s%s: ", prefix, colon, ctrl->name);
if (ctrl->handler != hdl)
v4l2_ctrl_lock(ctrl);
ctrl->type_ops->log(ctrl); ctrl->type_ops->log(ctrl);
if (ctrl->handler != hdl)
v4l2_ctrl_unlock(ctrl);
if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE | if (ctrl->flags & (V4L2_CTRL_FLAG_INACTIVE |
V4L2_CTRL_FLAG_GRABBED | V4L2_CTRL_FLAG_GRABBED |
@ -2532,7 +2537,7 @@ static void log_ctrl(const struct v4l2_ctrl *ctrl,
void v4l2_ctrl_handler_log_status(struct v4l2_ctrl_handler *hdl, void v4l2_ctrl_handler_log_status(struct v4l2_ctrl_handler *hdl,
const char *prefix) const char *prefix)
{ {
struct v4l2_ctrl *ctrl; struct v4l2_ctrl_ref *ref;
const char *colon = ""; const char *colon = "";
int len; int len;
@ -2544,9 +2549,12 @@ void v4l2_ctrl_handler_log_status(struct v4l2_ctrl_handler *hdl,
if (len && prefix[len - 1] != ' ') if (len && prefix[len - 1] != ' ')
colon = ": "; colon = ": ";
mutex_lock(hdl->lock); mutex_lock(hdl->lock);
list_for_each_entry(ctrl, &hdl->ctrls, node) list_for_each_entry(ref, &hdl->ctrl_refs, node) {
if (!(ctrl->flags & V4L2_CTRL_FLAG_DISABLED)) if (ref->from_other_dev ||
log_ctrl(ctrl, prefix, colon); (ref->ctrl->flags & V4L2_CTRL_FLAG_DISABLED))
continue;
log_ctrl(hdl, ref->ctrl, prefix, colon);
}
mutex_unlock(hdl->lock); mutex_unlock(hdl->lock);
} }
EXPORT_SYMBOL(v4l2_ctrl_handler_log_status); EXPORT_SYMBOL(v4l2_ctrl_handler_log_status);