From 2f1d8a9a4f0797718dd79c929f72de7ad4e23adb Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 18 Nov 2011 12:38:38 +0200
Subject: [PATCH] --- yaml --- r: 284955 b: refs/heads/master c:
 9d11c321a84266db2dba82cfb0d9d3bc17c326a8 h: refs/heads/master i:   284953:
 d7b6a78abb9495018b601ac376136ad8a2f596f3   284951:
 40b4aa9fa6612af6971f4476e069098cf0a058da v: v3

---
 [refs]                        |  2 +-
 trunk/include/video/omapdss.h | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4de95666a9a9..0097fb2dce7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e70f98acaa84ec9ad55e544d0dc8b2d0a36bbeca
+refs/heads/master: 9d11c321a84266db2dba82cfb0d9d3bc17c326a8
diff --git a/trunk/include/video/omapdss.h b/trunk/include/video/omapdss.h
index 98fc0267dd9e..39862b8c9805 100644
--- a/trunk/include/video/omapdss.h
+++ b/trunk/include/video/omapdss.h
@@ -384,6 +384,17 @@ struct omap_overlay {
 	/* dynamic fields */
 	struct omap_overlay_manager *manager;
 
+	/*
+	 * The following functions do not block:
+	 *
+	 * is_enabled
+	 * set_overlay_info
+	 * get_overlay_info
+	 *
+	 * The rest of the functions may block and cannot be called from
+	 * interrupt context
+	 */
+
 	int (*enable)(struct omap_overlay *ovl);
 	int (*disable)(struct omap_overlay *ovl);
 	bool (*is_enabled)(struct omap_overlay *ovl);
@@ -426,6 +437,17 @@ struct omap_overlay_manager {
 	/* dynamic fields */
 	struct omap_dss_device *device;
 
+	/*
+	 * The following functions do not block:
+	 *
+	 * set_manager_info
+	 * get_manager_info
+	 * apply
+	 *
+	 * The rest of the functions may block and cannot be called from
+	 * interrupt context
+	 */
+
 	int (*set_device)(struct omap_overlay_manager *mgr,
 		struct omap_dss_device *dssdev);
 	int (*unset_device)(struct omap_overlay_manager *mgr);