| Message ID | 1435164631-19924-4-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Lars-Peter, On Wed, Jun 24, 2015 at 06:50:30PM +0200, Lars-Peter Clausen wrote: > Use the new v4l2_subdev_notify_event() helper function to deliver the > resolution change event to userspace via the v4l2 subdev event queue as > well as to the bridge driver using the callback notify mechanism. > > This allows userspace applications to react to changes in resolution. This > is useful and often necessary for video pipelines where there is no direct > 1-to-1 relationship between the subdevice converter and the video capture > device and hence it does not make sense to directly forward the event to > the video capture device node. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/media/i2c/adv7604.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c > index cf1cb5a..b66f63e3 100644 > --- a/drivers/media/i2c/adv7604.c > +++ b/drivers/media/i2c/adv7604.c > @@ -1761,8 +1761,8 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd, > select_input(sd); > enable_input(sd); > > - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, > - (void *)&adv76xx_ev_fmt); > + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); > + > return 0; > } > > @@ -1929,8 +1929,7 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) > "%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n", > __func__, fmt_change, fmt_change_digital); > > - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, > - (void *)&adv76xx_ev_fmt); > + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); > > if (handled) > *handled = true; > @@ -2348,6 +2347,20 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) > return 0; > } > > +static int adv76xx_subscribe_event(struct v4l2_subdev *sd, > + struct v4l2_fh *fh, > + struct v4l2_event_subscription *sub) > +{ > + switch (sub->type) { > + case V4L2_EVENT_SOURCE_CHANGE: > + return v4l2_src_change_event_subdev_subscribe(sd, fh, sub); > + case V4L2_EVENT_CTRL: > + return v4l2_event_subdev_unsubscribe(sd, fh, sub); This should be ..._subscribe(), shouldn't it? You could simply use v4l2_event_subscribe(fh, sub), v4l2_event_subdev_unsubscribe() is there so you can use it directly as the subscribe_event() op. > + default: > + return -EINVAL; > + } > +} > + > /* ----------------------------------------------------------------------- */ > > static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { > @@ -2357,7 +2370,7 @@ static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { > static const struct v4l2_subdev_core_ops adv76xx_core_ops = { > .log_status = adv76xx_log_status, > .interrupt_service_routine = adv76xx_isr, > - .subscribe_event = v4l2_ctrl_subdev_subscribe_event, > + .subscribe_event = adv76xx_subscribe_event, > .unsubscribe_event = v4l2_event_subdev_unsubscribe, > #ifdef CONFIG_VIDEO_ADV_DEBUG > .g_register = adv76xx_g_register,
On 06/25/2015 12:21 PM, Sakari Ailus wrote: > Hi Lars-Peter, > > On Wed, Jun 24, 2015 at 06:50:30PM +0200, Lars-Peter Clausen wrote: >> Use the new v4l2_subdev_notify_event() helper function to deliver the >> resolution change event to userspace via the v4l2 subdev event queue as >> well as to the bridge driver using the callback notify mechanism. >> >> This allows userspace applications to react to changes in resolution. This >> is useful and often necessary for video pipelines where there is no direct >> 1-to-1 relationship between the subdevice converter and the video capture >> device and hence it does not make sense to directly forward the event to >> the video capture device node. >> >> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> >> --- >> drivers/media/i2c/adv7604.c | 23 ++++++++++++++++++----- >> 1 file changed, 18 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c >> index cf1cb5a..b66f63e3 100644 >> --- a/drivers/media/i2c/adv7604.c >> +++ b/drivers/media/i2c/adv7604.c >> @@ -1761,8 +1761,8 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd, >> select_input(sd); >> enable_input(sd); >> >> - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, >> - (void *)&adv76xx_ev_fmt); >> + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); >> + >> return 0; >> } >> >> @@ -1929,8 +1929,7 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) >> "%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n", >> __func__, fmt_change, fmt_change_digital); >> >> - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, >> - (void *)&adv76xx_ev_fmt); >> + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); >> >> if (handled) >> *handled = true; >> @@ -2348,6 +2347,20 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) >> return 0; >> } >> >> +static int adv76xx_subscribe_event(struct v4l2_subdev *sd, >> + struct v4l2_fh *fh, >> + struct v4l2_event_subscription *sub) >> +{ >> + switch (sub->type) { >> + case V4L2_EVENT_SOURCE_CHANGE: >> + return v4l2_src_change_event_subdev_subscribe(sd, fh, sub); >> + case V4L2_EVENT_CTRL: >> + return v4l2_event_subdev_unsubscribe(sd, fh, sub); > > This should be ..._subscribe(), shouldn't it? Right, not sure how that happened. > > You could simply use v4l2_event_subscribe(fh, sub), > v4l2_event_subdev_unsubscribe() is there so you can use it directly as the > subscribe_event() op. It's just to be on the safe side in case v4l2_event_subdev_subscribe() starts to do something in addition to just being a wrapper around v4l2_event_subscribe(). Thanks, - Lars -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/24/2015 06:50 PM, Lars-Peter Clausen wrote: > Use the new v4l2_subdev_notify_event() helper function to deliver the > resolution change event to userspace via the v4l2 subdev event queue as > well as to the bridge driver using the callback notify mechanism. > > This allows userspace applications to react to changes in resolution. This > is useful and often necessary for video pipelines where there is no direct > 1-to-1 relationship between the subdevice converter and the video capture > device and hence it does not make sense to directly forward the event to > the video capture device node. > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/media/i2c/adv7604.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c > index cf1cb5a..b66f63e3 100644 > --- a/drivers/media/i2c/adv7604.c > +++ b/drivers/media/i2c/adv7604.c > @@ -1761,8 +1761,8 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd, > select_input(sd); > enable_input(sd); > > - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, > - (void *)&adv76xx_ev_fmt); > + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); > + > return 0; > } > > @@ -1929,8 +1929,7 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) > "%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n", > __func__, fmt_change, fmt_change_digital); > > - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, > - (void *)&adv76xx_ev_fmt); > + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); > > if (handled) > *handled = true; > @@ -2348,6 +2347,20 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) > return 0; > } > > +static int adv76xx_subscribe_event(struct v4l2_subdev *sd, > + struct v4l2_fh *fh, > + struct v4l2_event_subscription *sub) > +{ > + switch (sub->type) { > + case V4L2_EVENT_SOURCE_CHANGE: > + return v4l2_src_change_event_subdev_subscribe(sd, fh, sub); > + case V4L2_EVENT_CTRL: > + return v4l2_event_subdev_unsubscribe(sd, fh, sub); This should be v4l2_ctrl_subdev_subscribe_event() of course. I'll fix this in the patch before sending the pull request. Ditto for the adv7842 patch. Regards, Hans > + default: > + return -EINVAL; > + } > +} > + > /* ----------------------------------------------------------------------- */ > > static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { > @@ -2357,7 +2370,7 @@ static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { > static const struct v4l2_subdev_core_ops adv76xx_core_ops = { > .log_status = adv76xx_log_status, > .interrupt_service_routine = adv76xx_isr, > - .subscribe_event = v4l2_ctrl_subdev_subscribe_event, > + .subscribe_event = adv76xx_subscribe_event, > .unsubscribe_event = v4l2_event_subdev_unsubscribe, > #ifdef CONFIG_VIDEO_ADV_DEBUG > .g_register = adv76xx_g_register, > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/13/2015 11:02 AM, Hans Verkuil wrote: >> +static int adv76xx_subscribe_event(struct v4l2_subdev *sd, >> + struct v4l2_fh *fh, >> + struct v4l2_event_subscription *sub) >> +{ >> + switch (sub->type) { >> + case V4L2_EVENT_SOURCE_CHANGE: >> + return v4l2_src_change_event_subdev_subscribe(sd, fh, sub); >> + case V4L2_EVENT_CTRL: >> + return v4l2_event_subdev_unsubscribe(sd, fh, sub); > > This should be v4l2_ctrl_subdev_subscribe_event() of course. I'll fix this in > the patch before sending the pull request. Ditto for the adv7842 patch. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index cf1cb5a..b66f63e3 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -1761,8 +1761,8 @@ static int adv76xx_s_routing(struct v4l2_subdev *sd, select_input(sd); enable_input(sd); - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, - (void *)&adv76xx_ev_fmt); + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); + return 0; } @@ -1929,8 +1929,7 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled) "%s: fmt_change = 0x%x, fmt_change_digital = 0x%x\n", __func__, fmt_change, fmt_change_digital); - v4l2_subdev_notify(sd, V4L2_DEVICE_NOTIFY_EVENT, - (void *)&adv76xx_ev_fmt); + v4l2_subdev_notify_event(sd, &adv76xx_ev_fmt); if (handled) *handled = true; @@ -2348,6 +2347,20 @@ static int adv76xx_log_status(struct v4l2_subdev *sd) return 0; } +static int adv76xx_subscribe_event(struct v4l2_subdev *sd, + struct v4l2_fh *fh, + struct v4l2_event_subscription *sub) +{ + switch (sub->type) { + case V4L2_EVENT_SOURCE_CHANGE: + return v4l2_src_change_event_subdev_subscribe(sd, fh, sub); + case V4L2_EVENT_CTRL: + return v4l2_event_subdev_unsubscribe(sd, fh, sub); + default: + return -EINVAL; + } +} + /* ----------------------------------------------------------------------- */ static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { @@ -2357,7 +2370,7 @@ static const struct v4l2_ctrl_ops adv76xx_ctrl_ops = { static const struct v4l2_subdev_core_ops adv76xx_core_ops = { .log_status = adv76xx_log_status, .interrupt_service_routine = adv76xx_isr, - .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .subscribe_event = adv76xx_subscribe_event, .unsubscribe_event = v4l2_event_subdev_unsubscribe, #ifdef CONFIG_VIDEO_ADV_DEBUG .g_register = adv76xx_g_register,
Use the new v4l2_subdev_notify_event() helper function to deliver the resolution change event to userspace via the v4l2 subdev event queue as well as to the bridge driver using the callback notify mechanism. This allows userspace applications to react to changes in resolution. This is useful and often necessary for video pipelines where there is no direct 1-to-1 relationship between the subdevice converter and the video capture device and hence it does not make sense to directly forward the event to the video capture device node. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/media/i2c/adv7604.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)