Hi Tomi and Sakari,
Thank you for the patch.
On Thu, Apr 15, 2021 at 04:04:46PM +0300, Tomi Valkeinen wrote:
> From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
>
> With the addition of the has_route() media entity operation, all pads of an
> entity are no longer interconnected. The S_ROUTING IOCTL for sub-devices can
> be used to enable and disable routes for an entity. The consequence is that
> the routing information has to be taken into account in use count
> calculation: disabling a route has a very similar effect on use counts as
> has disabling a link.
>
> Add a helper function for drivers implementing VIDIOC_SUBDEV_S_ROUTING
> IOCTL to take the change into account.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> ---
> drivers/media/v4l2-core/v4l2-mc.c | 34 +++++++++++++++++++++++++++++++
> include/media/v4l2-mc.h | 22 ++++++++++++++++++++
> 2 files changed, 56 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
> index 35d18ed89fa5..71acb389aa7b 100644
> --- a/drivers/media/v4l2-core/v4l2-mc.c
> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> @@ -588,3 +588,37 @@ int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
> return ret;
> }
> EXPORT_SYMBOL_GPL(v4l2_pipeline_link_notify);
> +
> +int v4l2_subdev_routing_pm_use(struct media_entity *entity,
> + struct v4l2_subdev_route *route)
> +{
> + struct media_graph *graph =
> + &entity->graph_obj.mdev->pm_count_walk;
> + struct media_pad *source = &entity->pads[route->source_pad];
> + struct media_pad *sink = &entity->pads[route->sink_pad];
> + int source_use;
> + int sink_use;
> + int ret;
> +
> + source_use = pipeline_pm_use_count(source, graph);
> + sink_use = pipeline_pm_use_count(sink, graph);
> +
> + if (!(route->flags & V4L2_SUBDEV_ROUTE_FL_ACTIVE)) {
> + /* Route disabled. */
> + pipeline_pm_power(source, -sink_use, graph);
> + pipeline_pm_power(sink, -source_use, graph);
> + return 0;
> + }
> +
> + /* Route enabled. */
> + ret = pipeline_pm_power(source, sink_use, graph);
> + if (ret < 0)
> + return ret;
> +
> + ret = pipeline_pm_power(sink, source_use, graph);
> + if (ret < 0)
> + pipeline_pm_power(source, -sink_use, graph);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_subdev_routing_pm_use);
.s_power() is getting deprecated for sensors. Sakari, should we move
away from pipeline-based power management and drop this patch, or is it
too early ?
> diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
> index c181685923d5..ab8f4dc143aa 100644
> --- a/include/media/v4l2-mc.h
> +++ b/include/media/v4l2-mc.h
> @@ -18,6 +18,7 @@
> /* We don't need to include pci.h or usb.h here */
> struct pci_dev;
> struct usb_device;
> +struct v4l2_subdev_route;
>
> #ifdef CONFIG_MEDIA_CONTROLLER
> /**
> @@ -184,6 +185,22 @@ void v4l2_pipeline_pm_put(struct media_entity *entity);
> int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
> unsigned int notification);
>
> +/**
> + * v4l2_subdev_routing_pm_use - Handle power state changes due to S_ROUTING
> + * @entity: The entity
> + * @route: The new state of the route
> + *
> + * Propagate the use count across a route in a pipeline whenever the
> + * route is enabled or disabled. The function is called before
> + * changing the route state when enabling a route, and after changing
> + * the route state when disabling a route.
> + *
> + * Return 0 on success or a negative error code on failure. Powering entities
> + * off is assumed to never fail. This function will not fail for disconnection
> + * events.
"disconnection events" make me think about hotplug. How about "will not
fail when disabling a route" ?
> + */
> +int v4l2_subdev_routing_pm_use(struct media_entity *entity,
> + struct v4l2_subdev_route *route);
> #else /* CONFIG_MEDIA_CONTROLLER */
>
> static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
> @@ -219,5 +236,10 @@ static inline int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
> return 0;
> }
>
> +static inline int v4l2_subdev_routing_pm_use(struct media_entity *entity,
> + struct v4l2_subdev_route *route)
> +{
> + return 0;
> +}
Missing blank line.
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
(assuming we want to keep the patch)
> #endif /* CONFIG_MEDIA_CONTROLLER */
> #endif /* _V4L2_MC_H */
--
Regards,
Laurent Pinchart
