summaryrefslogtreecommitdiffstats
path: root/include/media/media-device.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-14 17:50:08 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 15:18:42 +0100
commit18710dc67a433ed2c3ecaaffefd8e34502e53262 (patch)
tree641ab8210e297bb165a53536035d23d3e1df7dd5 /include/media/media-device.h
parent[media] media: use media_gobj inside entities (diff)
downloadlinux-18710dc67a433ed2c3ecaaffefd8e34502e53262.tar.xz
linux-18710dc67a433ed2c3ecaaffefd8e34502e53262.zip
[media] media: use media_gobj inside pads
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 support dynamic changes, for now we'll keep PADs as arrays and initialize the media_gobj embedded structs when registering the entity. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media/media-device.h')
-rw-r--r--include/media/media-device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/media-device.h b/include/media/media-device.h
index f6deef6e5820..9493721f630e 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
@@ -69,6 +70,7 @@ struct media_device {
u32 driver_version;
u32 entity_id;
+ u32 pad_id;
struct list_head entities;