Commit 6e6d76cd authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] v4l2-event: fix regression with initial event handling

If the V4L2_EVENT_SUB_FL_SEND_INITIAL was set, then the application expects
to receive an initial event of the initial value of the control.

However, commit c53c2549 that added the new
v4l2_subscribed_event_ops introduced a regression: while the code still queued
that initial event the __v4l2_event_queue_fh() function was modified to ignore
such requests if sev->elems was 0 (meaning that the event subscription wasn't
finished yet).

And sev->elems was only set to a non-zero value after the add operation
returned.

This patch fixes this by passing the elems value to the add function. Then the
add function can set it before queuing the initial event.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 69ecdbac
...@@ -1250,7 +1250,7 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle, ...@@ -1250,7 +1250,7 @@ static void uvc_ctrl_send_events(struct uvc_fh *handle,
} }
} }
static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev) static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)
{ {
struct uvc_fh *handle = container_of(sev->fh, struct uvc_fh, vfh); struct uvc_fh *handle = container_of(sev->fh, struct uvc_fh, vfh);
struct uvc_control_mapping *mapping; struct uvc_control_mapping *mapping;
...@@ -1278,6 +1278,9 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev) ...@@ -1278,6 +1278,9 @@ static int uvc_ctrl_add_event(struct v4l2_subscribed_event *sev)
uvc_ctrl_fill_event(handle->chain, &ev, ctrl, mapping, val, uvc_ctrl_fill_event(handle->chain, &ev, ctrl, mapping, val,
changes); changes);
/* Mark the queue as active, allowing this initial
event to be accepted. */
sev->elems = elems;
v4l2_event_queue_fh(sev->fh, &ev); v4l2_event_queue_fh(sev->fh, &ev);
} }
......
...@@ -2559,7 +2559,7 @@ int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val) ...@@ -2559,7 +2559,7 @@ int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val)
} }
EXPORT_SYMBOL(v4l2_ctrl_s_ctrl); EXPORT_SYMBOL(v4l2_ctrl_s_ctrl);
static int v4l2_ctrl_add_event(struct v4l2_subscribed_event *sev) static int v4l2_ctrl_add_event(struct v4l2_subscribed_event *sev, unsigned elems)
{ {
struct v4l2_ctrl *ctrl = v4l2_ctrl_find(sev->fh->ctrl_handler, sev->id); struct v4l2_ctrl *ctrl = v4l2_ctrl_find(sev->fh->ctrl_handler, sev->id);
...@@ -2576,6 +2576,9 @@ static int v4l2_ctrl_add_event(struct v4l2_subscribed_event *sev) ...@@ -2576,6 +2576,9 @@ static int v4l2_ctrl_add_event(struct v4l2_subscribed_event *sev)
if (!(ctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)) if (!(ctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY))
changes |= V4L2_EVENT_CTRL_CH_VALUE; changes |= V4L2_EVENT_CTRL_CH_VALUE;
fill_event(&ev, ctrl, changes); fill_event(&ev, ctrl, changes);
/* Mark the queue as active, allowing this initial
event to be accepted. */
sev->elems = elems;
v4l2_event_queue_fh(sev->fh, &ev); v4l2_event_queue_fh(sev->fh, &ev);
} }
v4l2_ctrl_unlock(ctrl); v4l2_ctrl_unlock(ctrl);
......
...@@ -239,7 +239,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh, ...@@ -239,7 +239,7 @@ int v4l2_event_subscribe(struct v4l2_fh *fh,
} }
if (sev->ops && sev->ops->add) { if (sev->ops && sev->ops->add) {
int ret = sev->ops->add(sev); int ret = sev->ops->add(sev, elems);
if (ret) { if (ret) {
sev->ops = NULL; sev->ops = NULL;
v4l2_event_unsubscribe(fh, sub); v4l2_event_unsubscribe(fh, sub);
......
...@@ -85,7 +85,7 @@ struct v4l2_kevent { ...@@ -85,7 +85,7 @@ struct v4l2_kevent {
* @merge: Optional callback that can merge event 'old' into event 'new'. * @merge: Optional callback that can merge event 'old' into event 'new'.
*/ */
struct v4l2_subscribed_event_ops { struct v4l2_subscribed_event_ops {
int (*add)(struct v4l2_subscribed_event *sev); int (*add)(struct v4l2_subscribed_event *sev, unsigned elems);
void (*del)(struct v4l2_subscribed_event *sev); void (*del)(struct v4l2_subscribed_event *sev);
void (*replace)(struct v4l2_event *old, const struct v4l2_event *new); void (*replace)(struct v4l2_event *old, const struct v4l2_event *new);
void (*merge)(const struct v4l2_event *old, struct v4l2_event *new); void (*merge)(const struct v4l2_event *old, struct v4l2_event *new);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment