Message ID | 20211130141536.891878-16-tomi.valkeinen@ideasonboard.com |
---|---|
State | New |
Headers | show |
Series | v4l: subdev internal routing and streams | expand |
Hello Tomi, Thank you for the patch. On Tue, Nov 30, 2021 at 04:15:13PM +0200, Tomi Valkeinen 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: Sakari Ailus <sakari.ailus@linux.intel.com> > Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > --- > drivers/media/mc/mc-entity.c | 19 +++++++++++++++++++ > include/media/media-entity.h | 17 +++++++++++++++++ > 2 files changed, 36 insertions(+) > > diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c > index b44ab423b49b..a83f004efd37 100644 > --- a/drivers/media/mc/mc-entity.c > +++ b/drivers/media/mc/mc-entity.c > @@ -229,6 +229,25 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); > * Graph traversal > */ > > +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; > + > + if (entity->pads[pad1].index < entity->pads[pad0].index) > + swap(pad0, pad1); > + > + return entity->ops->has_route(entity, pad0, pad1); > +} > +EXPORT_SYMBOL_GPL(media_entity_has_route); As this function is only used in mc-entity.c, can we avoid exposing it for now ? It's a new API, and I'd rather be notified if drivers start using it directly by requiring a patch to expose the function at that point. > + > static struct media_pad * > media_pad_other(struct media_pad *pad, struct media_link *link) > { > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > index ad4020b2df65..b3069eef7fdb 100644 > --- a/include/media/media-entity.h > +++ b/include/media/media-entity.h > @@ -904,6 +904,23 @@ int media_entity_get_fwnode_pad(struct media_entity *entity, > __must_check int media_graph_walk_init( > struct media_graph *graph, struct media_device *mdev); > > +/** > + * 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->graph_obj.mdev->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); > + > /** > * media_graph_walk_cleanup - Release resources used by graph walk. > *
On 09/01/2022 01:31, Laurent Pinchart wrote: > Hello Tomi, > > Thank you for the patch. > > On Tue, Nov 30, 2021 at 04:15:13PM +0200, Tomi Valkeinen 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: Sakari Ailus <sakari.ailus@linux.intel.com> >> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> >> --- >> drivers/media/mc/mc-entity.c | 19 +++++++++++++++++++ >> include/media/media-entity.h | 17 +++++++++++++++++ >> 2 files changed, 36 insertions(+) >> >> diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c >> index b44ab423b49b..a83f004efd37 100644 >> --- a/drivers/media/mc/mc-entity.c >> +++ b/drivers/media/mc/mc-entity.c >> @@ -229,6 +229,25 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); >> * Graph traversal >> */ >> >> +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; >> + >> + if (entity->pads[pad1].index < entity->pads[pad0].index) >> + swap(pad0, pad1); >> + >> + return entity->ops->has_route(entity, pad0, pad1); >> +} >> +EXPORT_SYMBOL_GPL(media_entity_has_route); > > As this function is only used in mc-entity.c, can we avoid exposing it > for now ? It's a new API, and I'd rather be notified if drivers start > using it directly by requiring a patch to expose the function at that > point. Sounds good to me. Tomi
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c index b44ab423b49b..a83f004efd37 100644 --- a/drivers/media/mc/mc-entity.c +++ b/drivers/media/mc/mc-entity.c @@ -229,6 +229,25 @@ EXPORT_SYMBOL_GPL(media_entity_pads_init); * Graph traversal */ +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; + + if (entity->pads[pad1].index < entity->pads[pad0].index) + swap(pad0, pad1); + + return entity->ops->has_route(entity, pad0, pad1); +} +EXPORT_SYMBOL_GPL(media_entity_has_route); + static struct media_pad * media_pad_other(struct media_pad *pad, struct media_link *link) { diff --git a/include/media/media-entity.h b/include/media/media-entity.h index ad4020b2df65..b3069eef7fdb 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -904,6 +904,23 @@ int media_entity_get_fwnode_pad(struct media_entity *entity, __must_check int media_graph_walk_init( struct media_graph *graph, struct media_device *mdev); +/** + * 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->graph_obj.mdev->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); + /** * media_graph_walk_cleanup - Release resources used by graph walk. *