On 08/14/2015 04:56 PM, Mauro Carvalho Chehab wrote:
> As entities are graph elements, let's embeed media_graph_obj
s/embeed/embed/
> on it. That ensures an unique ID for entities that can be
> global along the entire media controller.
>
> For now, we'll keep the already existing entity ID. Such
> field need to be dropped on some point, but for now, let's
s/on/at/
> not do this, to avoid needing to review all drivers and
> the userspace apps.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
> index b9382f06044a..f06b08392007 100644
> --- a/drivers/media/media-device.c
> +++ b/drivers/media/media-device.c
> @@ -377,7 +377,6 @@ int __must_check __media_device_register(struct media_device *mdev,
> if (WARN_ON(mdev->dev == NULL || mdev->model[0] == 0))
> return -EINVAL;
>
> - mdev->entity_id = 1;
> INIT_LIST_HEAD(&mdev->entities);
> spin_lock_init(&mdev->lock);
> mutex_init(&mdev->graph_mutex);
> @@ -431,11 +430,9 @@ int __must_check media_device_register_entity(struct media_device *mdev,
> entity->parent = mdev;
>
> spin_lock(&mdev->lock);
> - if (entity->id == 0)
> - entity->id = mdev->entity_id++;
> - else
> - mdev->entity_id = max(entity->id + 1, mdev->entity_id);
> - list_add_tail(&entity->list, &mdev->entities);
> + /* Initialize media_graph_obj embedded at the entity */
> + graph_obj_init(mdev, MEDIA_GRAPH_ENTITY, &entity->graph_obj);
> +
> spin_unlock(&mdev->lock);
>
> return 0;
> @@ -457,6 +454,7 @@ void media_device_unregister_entity(struct media_entity *entity)
> return;
>
> spin_lock(&mdev->lock);
> + graph_obj_remove(&entity->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 046f1fe40b50..c06546509a89 100644
> --- a/drivers/media/media-entity.c
> +++ b/drivers/media/media-entity.c
> @@ -43,8 +43,12 @@ void graph_obj_init(struct media_device *mdev,
> enum media_graph_type type,
> struct media_graph_obj *gobj)
> {
> - /* An unique object ID will be provided on next patches */
> + /* Create a per-type unique object ID */
> gobj->id = type << 24;
> + switch (type) {
> + case MEDIA_GRAPH_ENTITY:
> + gobj->id |= ++mdev->entity_id;
Please add a break here.
> + }
> }
>
> /**
> diff --git a/include/media/media-device.h b/include/media/media-device.h
> index 6e6db78f1ee2..35634c0da362 100644
> --- a/include/media/media-device.h
> +++ b/include/media/media-device.h
> @@ -41,7 +41,7 @@ struct device;
> * @bus_info: Unique and stable device location identifier
> * @hw_revision: Hardware device revision
> * @driver_version: Device driver version
> - * @entity_id: ID of the next entity to be registered
> + * @entity_id: Unique ID used on the last entity registered
> * @entities: List of registered entities
> * @lock: Entities list lock
> * @graph_mutex: Entities graph operation lock
> @@ -68,7 +68,9 @@ struct media_device {
> u32 hw_revision;
> u32 driver_version;
>
> + /* Unique object ID counter */
> u32 entity_id;
> +
> struct list_head entities;
>
> /* Protects the entities list */
> diff --git a/include/media/media-entity.h b/include/media/media-entity.h
> index 58938bb980fe..2c775f3ef24f 100644
> --- a/include/media/media-entity.h
> +++ b/include/media/media-entity.h
> @@ -33,10 +33,10 @@
> /**
> * enum media_graph_type - type of a graph element
> *
> + * @MEDIA_GRAPH_ENTITY: Identify a media entity
> */
> enum media_graph_type {
> - /* FIXME: add the types here, as we embeed media_graph_obj */
> - MEDIA_GRAPH_NONE
> + MEDIA_GRAPH_ENTITY,
> };
>
>
> @@ -88,10 +88,9 @@ struct media_entity_operations {
> };
>
> struct media_entity {
> + struct media_graph_obj graph_obj;
> struct list_head list;
> struct media_device *parent; /* Media device this entity belongs to*/
> - u32 id; /* Entity ID, unique in the parent media
> - * device context */
> const char *name; /* Entity name */
> u32 type; /* Entity type (MEDIA_ENT_T_*) */
> u32 revision; /* Entity revision, driver specific */
> @@ -153,7 +152,7 @@ struct media_entity_graph {
> int top;
> };
>
> -#define entity_id(entity) ((entity)->id)
> +#define entity_id(entity) ((entity)->graph_obj.id)
>
> #define gobj_to_entity(gobj) \
> container_of(gobj, struct media_entity, graph_obj)
>
With the small items above fixed:
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
