On 08/14/2015 04:56 PM, Mauro Carvalho Chehab wrote:
> PADs also need unique object IDs that won't conflict with
> the entity object IDs.
>
> The pad objects are currently created via media_entity_init()
> and, once created, never change.
>
> While this will likely change in the future in order to
> suppory dynamic changes, for now we'll keep PADs as arrays
s/suppory/support/
> and initialize the media_graph_obj embeeded structs when
s/embeeded/embedded/
Hmm, I sense a pattern here :-)
> registering the entity.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
> index f06b08392007..3ac5803b327e 100644
> --- a/drivers/media/media-device.c
> +++ b/drivers/media/media-device.c
> @@ -425,6 +425,8 @@ EXPORT_SYMBOL_GPL(media_device_unregister);
> int __must_check media_device_register_entity(struct media_device *mdev,
> struct media_entity *entity)
> {
> + int i;
> +
> /* Warn if we apparently re-register an entity */
> WARN_ON(entity->parent != NULL);
> entity->parent = mdev;
> @@ -433,6 +435,12 @@ int __must_check media_device_register_entity(struct media_device *mdev,
> /* Initialize media_graph_obj embedded at the entity */
> graph_obj_init(mdev, MEDIA_GRAPH_ENTITY, &entity->graph_obj);
>
> + /* Initialize objects at the pads */
> + for (i = 0; i < entity->num_pads; i++)
> + graph_obj_init(mdev, MEDIA_GRAPH_PAD,
> + &entity->pads[i].graph_obj);
> +
> + list_add_tail(&entity->list, &mdev->entities);
> spin_unlock(&mdev->lock);
>
> return 0;
> @@ -448,6 +456,7 @@ EXPORT_SYMBOL_GPL(media_device_register_entity);
> */
> void media_device_unregister_entity(struct media_entity *entity)
> {
> + int i;
> struct media_device *mdev = entity->parent;
>
> if (mdev == NULL)
> @@ -455,6 +464,8 @@ void media_device_unregister_entity(struct media_entity *entity)
>
> spin_lock(&mdev->lock);
> graph_obj_remove(&entity->graph_obj);
> + for (i = 0; i < entity->num_pads; i++)
> + graph_obj_remove(&entity->pads[i].graph_obj);
> list_del(&entity->list);
> spin_unlock(&mdev->lock);
> entity->parent = NULL;
> diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> index c06546509a89..d3dee6fc79d7 100644
> --- a/drivers/media/media-entity.c
> +++ b/drivers/media/media-entity.c
> @@ -48,6 +48,8 @@ void graph_obj_init(struct media_device *mdev,
> switch (type) {
> case MEDIA_GRAPH_ENTITY:
> gobj->id |= ++mdev->entity_id;
And that's why you should always add a break after a case: this now
falls through into the next case, and that's not what you want.
> + case MEDIA_GRAPH_PAD:
> + gobj->id |= ++mdev->pad_id;
Ditto: add a break.
> }
> }
>
> diff --git a/include/media/media-device.h b/include/media/media-device.h
> index 35634c0da362..2a9d9260cccc 100644
> --- a/include/media/media-device.h
> +++ b/include/media/media-device.h
> @@ -42,6 +42,7 @@ struct device;
> * @hw_revision: Hardware device revision
> * @driver_version: Device driver version
> * @entity_id: Unique ID used on the last entity registered
> + * @pad_id: Unique ID used on the last pad registered
> * @entities: List of registered entities
> * @lock: Entities list lock
> * @graph_mutex: Entities graph operation lock
> @@ -70,6 +71,7 @@ struct media_device {
>
> /* Unique object ID counter */
> u32 entity_id;
> + u32 pad_id;
>
> struct list_head entities;
>
> diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> index 2c775f3ef24f..936f68f27bba 100644
> --- a/include/media/media-entity.h
> +++ b/include/media/media-entity.h
> @@ -34,9 +34,11 @@
> * enum media_graph_type - type of a graph element
> *
> * @MEDIA_GRAPH_ENTITY: Identify a media entity
> + * @MEDIA_GRAPH_PAD: Identify a media pad
> */
> enum media_graph_type {
> MEDIA_GRAPH_ENTITY,
> + MEDIA_GRAPH_PAD,
> };
>
>
> @@ -66,6 +68,7 @@ struct media_link {
> };
>
> struct media_pad {
> + struct media_graph_obj graph_obj;
> struct media_entity *entity; /* Entity this pad belongs to */
> u16 index; /* Pad index in the entity pads array */
> unsigned long flags; /* Pad flags (MEDIA_PAD_FL_*) */
>
After these issues are fixed you can add my:
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
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
