From: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Links are validated along the pipeline which is about to start streaming.
Not all the pads in entities that are traversed along that pipeline are
part of the pipeline, however. Skip the link validation for such pads,
and while at there rename "other_pad" to "local_pad" to convey the fact
the route to be checked is internal to the entity.
Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Signed-off-by: Jacopo Mondi <jacopo+renesas@xxxxxxxxxx>
---
drivers/media/media-entity.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 3304e76bbafa..5d21ecaaaf4b 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -488,11 +488,16 @@ __must_check int __media_pipeline_start(struct media_pad *pad,
bitmap_fill(has_no_links, entity->num_pads);
list_for_each_entry(link, &entity->links, list) {
- struct media_pad *other_pad = link->sink->entity == entity
+ struct media_pad *local_pad = link->sink->entity == entity
? link->sink : link->source;
+ /* Ignore pads to which there is no route. */
+ if (!media_entity_has_route(entity, pad->index,
+ local_pad->index))
+ continue;
+
/* Mark that a pad is connected by a link. */
- bitmap_clear(has_no_links, other_pad->index, 1);
+ bitmap_clear(has_no_links, local_pad->index, 1);
/*
* Pads that either do not need to connect or
@@ -501,13 +506,13 @@ __must_check int __media_pipeline_start(struct media_pad *pad,
*/
if (!(pad->flags & MEDIA_PAD_FL_MUST_CONNECT) ||
link->flags & MEDIA_LNK_FL_ENABLED)
- bitmap_set(active, other_pad->index, 1);
+ bitmap_set(active, local_pad->index, 1);
/*
* Link validation will only take place for
* sink ends of the link that are enabled.
*/
- if (link->sink != other_pad ||
+ if (link->sink != local_pad ||
!(link->flags & MEDIA_LNK_FL_ENABLED))
continue;
--
2.20.1
