FYI: I'm not reviewing patches 7-23, lots of people looked at those already,
and I trust that code :-)
Regards,
Hans
On 05/10/2021 10:57, Tomi Valkeinen wrote:
> From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
>
> With the upcoming use of the recently added has_route() media entity op,
> all the pads in an entity will no longer be considered interconnected.
> This has an effect where the media graph is traversed: the starting pad
> does make a difference.
>
> Prepare for this change by using pad instead of the entity as an argument
> for the graph walk operations. The actual graph traversal algorithm change
> is in further patches.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Reviewed-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
> ---
> Documentation/driver-api/media/mc-core.rst | 2 +-
> drivers/media/mc/mc-entity.c | 17 ++++++++---------
> drivers/media/platform/exynos4-is/media-dev.c | 4 ++--
> drivers/media/platform/omap3isp/ispvideo.c | 2 +-
> drivers/media/platform/vsp1/vsp1_video.c | 2 +-
> drivers/media/platform/xilinx/xilinx-dma.c | 2 +-
> drivers/media/v4l2-core/v4l2-mc.c | 6 +++---
> drivers/staging/media/omap4iss/iss_video.c | 4 ++--
> include/media/media-entity.h | 10 ++++------
> 9 files changed, 23 insertions(+), 26 deletions(-)
>
> diff --git a/Documentation/driver-api/media/mc-core.rst b/Documentation/driver-api/media/mc-core.rst
> index 57b5bbba944e..ba0aee982124 100644
> --- a/Documentation/driver-api/media/mc-core.rst
> +++ b/Documentation/driver-api/media/mc-core.rst
> @@ -167,7 +167,7 @@ Drivers initiate a graph traversal by calling
> :c:func:`media_graph_walk_start()`
>
> The graph structure, provided by the caller, is initialized to start graph
> -traversal at the given entity.
> +traversal at the given pad in an entity.
>
> Drivers can then retrieve the next entity by calling
> :c:func:`media_graph_walk_next()`
> diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
> index f40f41977142..47cdaa301838 100644
> --- a/drivers/media/mc/mc-entity.c
> +++ b/drivers/media/mc/mc-entity.c
> @@ -291,17 +291,16 @@ void media_graph_walk_cleanup(struct media_graph *graph)
> }
> EXPORT_SYMBOL_GPL(media_graph_walk_cleanup);
>
> -void media_graph_walk_start(struct media_graph *graph,
> - struct media_entity *entity)
> +void media_graph_walk_start(struct media_graph *graph, struct media_pad *pad)
> {
> media_entity_enum_zero(&graph->ent_enum);
> - media_entity_enum_set(&graph->ent_enum, entity);
> + media_entity_enum_set(&graph->ent_enum, pad->entity);
>
> graph->top = 0;
> graph->stack[graph->top].entity = NULL;
> - stack_push(graph, entity);
> - dev_dbg(entity->graph_obj.mdev->dev,
> - "begin graph walk at '%s'\n", entity->name);
> + stack_push(graph, pad->entity);
> + dev_dbg(pad->graph_obj.mdev->dev,
> + "begin graph walk at '%s':%u\n", pad->entity->name, pad->index);
> }
> EXPORT_SYMBOL_GPL(media_graph_walk_start);
>
> @@ -420,7 +419,7 @@ __must_check int __media_pipeline_start(struct media_entity *entity,
> goto error_graph_walk_start;
> }
>
> - media_graph_walk_start(&pipe->graph, entity);
> + media_graph_walk_start(&pipe->graph, entity->pads);
>
> while ((entity = media_graph_walk_next(graph))) {
> DECLARE_BITMAP(active, MEDIA_ENTITY_MAX_PADS);
> @@ -504,7 +503,7 @@ __must_check int __media_pipeline_start(struct media_entity *entity,
> * Link validation on graph failed. We revert what we did and
> * return the error.
> */
> - media_graph_walk_start(graph, entity_err);
> + media_graph_walk_start(graph, entity_err->pads);
>
> while ((entity_err = media_graph_walk_next(graph))) {
> /* Sanity check for negative stream_count */
> @@ -555,7 +554,7 @@ void __media_pipeline_stop(struct media_entity *entity)
> if (WARN_ON(!pipe))
> return;
>
> - media_graph_walk_start(graph, entity);
> + media_graph_walk_start(graph, entity->pads);
>
> while ((entity = media_graph_walk_next(graph))) {
> /* Sanity check for negative stream_count */
> diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
> index fa648721eaab..4ec7f7a6b0f6 100644
> --- a/drivers/media/platform/exynos4-is/media-dev.c
> +++ b/drivers/media/platform/exynos4-is/media-dev.c
> @@ -1173,7 +1173,7 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
> * through active links. This is needed as we cannot power on/off the
> * subdevs in random order.
> */
> - media_graph_walk_start(graph, entity);
> + media_graph_walk_start(graph, entity->pads);
>
> while ((entity = media_graph_walk_next(graph))) {
> if (!is_media_entity_v4l2_video_device(entity))
> @@ -1188,7 +1188,7 @@ static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
> return 0;
>
> err:
> - media_graph_walk_start(graph, entity_err);
> + media_graph_walk_start(graph, entity_err->pads);
>
> while ((entity_err = media_graph_walk_next(graph))) {
> if (!is_media_entity_v4l2_video_device(entity_err))
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
> index 8811d6dd4ee7..3c1485d59404 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -234,7 +234,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
> return ret;
> }
>
> - media_graph_walk_start(&graph, entity);
> + media_graph_walk_start(&graph, entity->pads);
>
> while ((entity = media_graph_walk_next(&graph))) {
> struct isp_video *__video;
> diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
> index 044eb5778820..61e4fbaba7b7 100644
> --- a/drivers/media/platform/vsp1/vsp1_video.c
> +++ b/drivers/media/platform/vsp1/vsp1_video.c
> @@ -569,7 +569,7 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe,
> if (ret)
> return ret;
>
> - media_graph_walk_start(&graph, entity);
> + media_graph_walk_start(&graph, entity->pads);
>
> while ((entity = media_graph_walk_next(&graph))) {
> struct v4l2_subdev *subdev;
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
> index 338c3661d809..af0d55ab6c15 100644
> --- a/drivers/media/platform/xilinx/xilinx-dma.c
> +++ b/drivers/media/platform/xilinx/xilinx-dma.c
> @@ -189,7 +189,7 @@ static int xvip_pipeline_validate(struct xvip_pipeline *pipe,
> return ret;
> }
>
> - media_graph_walk_start(&graph, entity);
> + media_graph_walk_start(&graph, entity->pads);
>
> while ((entity = media_graph_walk_next(&graph))) {
> struct xvip_dma *dma;
> diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c
> index b01474717dca..d215fe31b9a2 100644
> --- a/drivers/media/v4l2-core/v4l2-mc.c
> +++ b/drivers/media/v4l2-core/v4l2-mc.c
> @@ -436,7 +436,7 @@ static int pipeline_pm_use_count(struct media_entity *entity,
> {
> int use = 0;
>
> - media_graph_walk_start(graph, entity);
> + media_graph_walk_start(graph, entity->pads);
>
> while ((entity = media_graph_walk_next(graph))) {
> if (is_media_entity_v4l2_video_device(entity))
> @@ -499,7 +499,7 @@ static int pipeline_pm_power(struct media_entity *entity, int change,
> if (!change)
> return 0;
>
> - media_graph_walk_start(graph, entity);
> + media_graph_walk_start(graph, entity->pads);
>
> while (!ret && (entity = media_graph_walk_next(graph)))
> if (is_media_entity_v4l2_subdev(entity))
> @@ -508,7 +508,7 @@ static int pipeline_pm_power(struct media_entity *entity, int change,
> if (!ret)
> return ret;
>
> - media_graph_walk_start(graph, first);
> + media_graph_walk_start(graph, first->pads);
>
> while ((first = media_graph_walk_next(graph))
> && first != entity)
> diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
> index d0da083deed5..760cd0ab1feb 100644
> --- a/drivers/staging/media/omap4iss/iss_video.c
> +++ b/drivers/staging/media/omap4iss/iss_video.c
> @@ -217,7 +217,7 @@ iss_video_far_end(struct iss_video *video)
> return NULL;
> }
>
> - media_graph_walk_start(&graph, entity);
> + media_graph_walk_start(&graph, entity->pads);
>
> while ((entity = media_graph_walk_next(&graph))) {
> if (entity == &video->video.entity)
> @@ -892,7 +892,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
> goto err_media_pipeline_start;
>
> mutex_lock(&mdev->graph_mutex);
> - media_graph_walk_start(&graph, entity);
> + media_graph_walk_start(&graph, entity->pads);
> while ((entity = media_graph_walk_next(&graph)))
> media_entity_enum_set(&pipe->ent_enum, entity);
> mutex_unlock(&mdev->graph_mutex);
> diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> index 09737b47881f..b9bfcf34eb0a 100644
> --- a/include/media/media-entity.h
> +++ b/include/media/media-entity.h
> @@ -902,22 +902,20 @@ __must_check int media_graph_walk_init(
> void media_graph_walk_cleanup(struct media_graph *graph);
>
> /**
> - * media_graph_walk_start - Start walking the media graph at a
> - * given entity
> + * media_graph_walk_start - Start walking the media graph at a given pad
> *
> * @graph: Media graph structure that will be used to walk the graph
> - * @entity: Starting entity
> + * @pad: Starting pad
> *
> * Before using this function, media_graph_walk_init() must be
> * used to allocate resources used for walking the graph. This
> * function initializes the graph traversal structure to walk the
> - * entities graph starting at the given entity. The traversal
> + * entities graph starting at the given pad. The traversal
> * structure must not be modified by the caller during graph
> * traversal. After the graph walk, the resources must be released
> * using media_graph_walk_cleanup().
> */
> -void media_graph_walk_start(struct media_graph *graph,
> - struct media_entity *entity);
> +void media_graph_walk_start(struct media_graph *graph, struct media_pad *pad);
>
> /**
> * media_graph_walk_next - Get the next entity in the graph
>
