diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-04-06 09:55:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-04-20 12:16:14 -0400 |
commit | 5ed470feb9a121582dbd455c72b133dc1a856a0a (patch) | |
tree | 2229f72ba54bc3950f5b7c94e3150f66fee48ee7 | |
parent | e2c91d4d78ee3a69ad634bc7ef90688704baab9d (diff) |
[media] media: Improve documentation for link_setup/link_modify
Those callbacks are called with the media_device.graph_mutex held.
Add a note about that, as the code called by those notifiers should
not be touching in the mutex.
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | include/media/media-device.h | 3 | ||||
-rw-r--r-- | include/media/media-entity.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/media-device.h b/include/media/media-device.h index b21ef244ad3e..a9b33c47310d 100644 --- a/include/media/media-device.h +++ b/include/media/media-device.h | |||
@@ -311,7 +311,8 @@ struct media_entity_notify { | |||
311 | * @enable_source: Enable Source Handler function pointer | 311 | * @enable_source: Enable Source Handler function pointer |
312 | * @disable_source: Disable Source Handler function pointer | 312 | * @disable_source: Disable Source Handler function pointer |
313 | * | 313 | * |
314 | * @link_notify: Link state change notification callback | 314 | * @link_notify: Link state change notification callback. This callback is |
315 | * called with the graph_mutex held. | ||
315 | * | 316 | * |
316 | * This structure represents an abstract high-level media device. It allows easy | 317 | * This structure represents an abstract high-level media device. It allows easy |
317 | * access to entities and provides basic media device-level support. The | 318 | * access to entities and provides basic media device-level support. The |
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index e0295eefd702..cbb266f7f2b5 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h | |||
@@ -179,6 +179,9 @@ struct media_pad { | |||
179 | * @link_validate: Return whether a link is valid from the entity point of | 179 | * @link_validate: Return whether a link is valid from the entity point of |
180 | * view. The media_entity_pipeline_start() function | 180 | * view. The media_entity_pipeline_start() function |
181 | * validates all links by calling this operation. Optional. | 181 | * validates all links by calling this operation. Optional. |
182 | * | ||
183 | * Note: Those these callbacks are called with struct media_device.@graph_mutex | ||
184 | * mutex held. | ||
182 | */ | 185 | */ |
183 | struct media_entity_operations { | 186 | struct media_entity_operations { |
184 | int (*link_setup)(struct media_entity *entity, | 187 | int (*link_setup)(struct media_entity *entity, |