Em Tue, 25 Aug 2015 09:44:09 +0200
Hans Verkuil <hverkuil@xxxxxxxxx> escreveu:
> On 08/23/2015 10:17 PM, Mauro Carvalho Chehab wrote:
> > Now that we have a new graph object called "interfaces", we
> > need to be able to link them to the entities.
> >
> > Add a linked list to the interfaces to allow them to be
> > linked to the entities.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> >
> > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> > index 5788297cd500..16d7d96abb9f 100644
> > --- a/drivers/media/media-entity.c
> > +++ b/drivers/media/media-entity.c
> > @@ -867,6 +867,7 @@ struct media_intf_devnode *media_devnode_create(struct media_device *mdev,
> >
> > intf->type = type;
> > intf->flags = flags;
> > + INIT_LIST_HEAD(&intf->links);
>
> See my comment in patch 14: this should be part of a media_interface_init helper
> function.
Ok. I'll add such patch at the end of the series.
> >
> > devnode->major = major;
> > devnode->minor = minor;
> > @@ -885,3 +886,39 @@ void media_devnode_remove(struct media_intf_devnode *devnode)
> > }
> > EXPORT_SYMBOL_GPL(media_devnode_remove);
> >
> > +struct media_link *media_create_intf_link(struct media_entity *entity,
> > + struct media_interface *intf,
> > + u32 flags)
> > +{
> > + struct media_link *link;
> > +
> > + link = media_add_link(&intf->links);
> > + if (link == NULL)
> > + return NULL;
> > +
> > + link->intf = intf;
> > + link->entity = entity;
> > + link->flags = flags;
> > +
> > + /* Initialize graph object embedded at the new link */
> > + media_gobj_init(intf->graph_obj.mdev, MEDIA_GRAPH_LINK,
> > + &link->graph_obj);
> > +
> > + return link;
> > +}
> > +EXPORT_SYMBOL_GPL(media_create_intf_link);
> > +
> > +
> > +static void __media_remove_intf_link(struct media_link *link)
> > +{
> > + list_del(&link->list);
> > + kfree(link);
> > +}
> > +
> > +void media_remove_intf_link(struct media_link *link)
> > +{
> > + mutex_lock(&link->graph_obj.mdev->graph_mutex);
> > + __media_remove_intf_link(link);
> > + mutex_unlock(&link->graph_obj.mdev->graph_mutex);
> > +}
> > +EXPORT_SYMBOL_GPL(media_remove_intf_link);
> > diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> > index f6e8fa801cf9..aeb390a9e0f3 100644
> > --- a/include/media/media-entity.h
> > +++ b/include/media/media-entity.h
> > @@ -78,10 +78,12 @@ struct media_link {
> > union {
> > struct media_gobj *port0;
> > struct media_pad *source;
> > + struct media_interface *intf;
> > };
> > union {
> > struct media_gobj *port1;
> > struct media_pad *sink;
> > + struct media_entity *entity;
> > };
> > struct media_link *reverse; /* Link in the reverse direction */
> > unsigned long flags; /* Link flags (MEDIA_LNK_FL_*) */
> > @@ -154,6 +156,7 @@ struct media_entity {
> > * struct media_intf_devnode - Define a Kernel API interface
> > *
> > * @graph_obj: embedded graph object
> > + * @links: List of links pointing to graph entities
>
> Nitpick: s/graph/media/
OK.
>
> > * @type: Type of the interface as defined at the
> > * uapi/media/media.h header, e. g.
> > * MEDIA_INTF_T_*
> > @@ -161,6 +164,7 @@ struct media_entity {
> > */
> > struct media_interface {
> > struct media_gobj graph_obj;
> > + struct list_head links;
> > u32 type;
> > u32 flags;
> > };
> > @@ -283,6 +287,11 @@ struct media_intf_devnode *media_devnode_create(struct media_device *mdev,
> > u32 major, u32 minor,
> > gfp_t gfp_flags);
> > void media_devnode_remove(struct media_intf_devnode *devnode);
> > +struct media_link *media_create_intf_link(struct media_entity *entity,
> > + struct media_interface *intf,
> > + u32 flags);
> > +void media_remove_intf_link(struct media_link *link);
> > +
> > #define media_entity_call(entity, operation, args...) \
> > (((entity)->ops && (entity)->ops->operation) ? \
> > (entity)->ops->operation((entity) , ##args) : -ENOIOCTLCMD)
> >
>
> Regards,
>
> Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
