| Message ID | 20161102132329.436-3-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Niklas, On Wed, Nov 02, 2016 at 02:22:59PM +0100, Niklas Söderlund wrote: > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > This is a wrapper around the media entity has_route operation. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/media-entity.c | 29 +++++++++++++++++++++++++++++ > include/media/media-entity.h | 3 +++ > 2 files changed, 32 insertions(+) > > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c > index c68239e..4d03ea7 100644 > --- a/drivers/media/media-entity.c > +++ b/drivers/media/media-entity.c > @@ -242,6 +242,35 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); > * Graph traversal > */ > > +/** > + * media_entity_has_route - Check if two entity pads are connected internally > + * @entity: The entity > + * @pad0: The first pad index > + * @pad1: The second pad index > + * > + * This function can be used to check whether two pads of an entity are > + * connected internally in the entity. > + * > + * The caller must hold entity->source->parent->mutex. > + * > + * Return: true if the pads are connected internally and false otherwise. > + */ > +bool media_entity_has_route(struct media_entity *entity, unsigned int pad0, > + unsigned int pad1) > +{ > + if (pad0 >= entity->num_pads || pad1 >= entity->num_pads) > + return false; > + > + if (pad0 == pad1) > + return true; > + > + if (!entity->ops || !entity->ops->has_route) > + return true; > + > + return entity->ops->has_route(entity, pad0, pad1); > +} > +EXPORT_SYMBOL_GPL(media_entity_has_route); > + > static struct media_entity * > media_entity_other(struct media_entity *entity, struct media_link *link) > { > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > index 8f9fc85..5fb3f06 100644 > --- a/include/media/media-entity.h > +++ b/include/media/media-entity.h > @@ -851,6 +851,9 @@ void media_entity_graph_walk_cleanup(struct media_entity_graph *graph); > */ > void media_entity_put(struct media_entity *entity); > > +bool media_entity_has_route(struct media_entity *entity, unsigned int sink, > + unsigned int source); The Kerneldoc documentation should be found here, not in the .c file. Also the arguments are different from the actual implementation. That's the diff to what I happen to have here, feel free to use instead: <URL:http://git.retiisi.org.uk/?p=~sailus/linux.git;a=commitdiff;h=7c3bdf5bde5ac8627c94841bef6c6db34d8d2b2a> > + > /** > * media_entity_graph_walk_start - Start walking the media graph at a > * given entity
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index c68239e..4d03ea7 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -242,6 +242,35 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); * Graph traversal */ +/** + * media_entity_has_route - Check if two entity pads are connected internally + * @entity: The entity + * @pad0: The first pad index + * @pad1: The second pad index + * + * This function can be used to check whether two pads of an entity are + * connected internally in the entity. + * + * The caller must hold entity->source->parent->mutex. + * + * Return: true if the pads are connected internally and false otherwise. + */ +bool media_entity_has_route(struct media_entity *entity, unsigned int pad0, + unsigned int pad1) +{ + if (pad0 >= entity->num_pads || pad1 >= entity->num_pads) + return false; + + if (pad0 == pad1) + return true; + + if (!entity->ops || !entity->ops->has_route) + return true; + + return entity->ops->has_route(entity, pad0, pad1); +} +EXPORT_SYMBOL_GPL(media_entity_has_route); + static struct media_entity * media_entity_other(struct media_entity *entity, struct media_link *link) { diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 8f9fc85..5fb3f06 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -851,6 +851,9 @@ void media_entity_graph_walk_cleanup(struct media_entity_graph *graph); */ void media_entity_put(struct media_entity *entity); +bool media_entity_has_route(struct media_entity *entity, unsigned int sink, + unsigned int source); + /** * media_entity_graph_walk_start - Start walking the media graph at a * given entity