---

yaml --- r: 284955 b: refs/heads/master c: 9d11c32 h: refs/heads/master i: 284953: d7b6a78 284951: 40b4aa9 v: v3
git-mirror · Dec 2, 2011 · 2f1d8a9 · 2f1d8a9
1 parent e275723
commit 2f1d8a9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git 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
@@ -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);