aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-10 07:13:15 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-10-29 06:44:39 -0400
commit04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7 (patch)
tree28cd5c3bff61e7f4c9ffcc279a7a2d91ff84a46b /drivers/video
parentf1a813d35f5aa53290814b2c646972b4e89c733e (diff)
OMAPDSS: add dispc_ovl_enabled()
Add new dispc function, dispc_ovl_enabled(). This returns if the overlay enable bit is set in the registers. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/omap2/dss/dispc.c5
-rw-r--r--drivers/video/omap2/dss/dss.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index b5cdbaf61f0..3fd60ce3d71 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2589,6 +2589,11 @@ int dispc_ovl_enable(enum omap_plane plane, bool enable)
2589 return 0; 2589 return 0;
2590} 2590}
2591 2591
2592bool dispc_ovl_enabled(enum omap_plane plane)
2593{
2594 return REG_GET(DISPC_OVL_ATTRIBUTES(plane), 0, 0);
2595}
2596
2592static void dispc_mgr_disable_isr(void *data, u32 mask) 2597static void dispc_mgr_disable_isr(void *data, u32 mask)
2593{ 2598{
2594 struct completion *compl = data; 2599 struct completion *compl = data;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 85c6fc8cec1..e3e5a63dace 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -427,6 +427,7 @@ int dispc_ovl_setup(enum omap_plane plane, const struct omap_overlay_info *oi,
427 bool replication, const struct omap_video_timings *mgr_timings, 427 bool replication, const struct omap_video_timings *mgr_timings,
428 bool mem_to_mem); 428 bool mem_to_mem);
429int dispc_ovl_enable(enum omap_plane plane, bool enable); 429int dispc_ovl_enable(enum omap_plane plane, bool enable);
430bool dispc_ovl_enabled(enum omap_plane plane);
430void dispc_ovl_set_channel_out(enum omap_plane plane, 431void dispc_ovl_set_channel_out(enum omap_plane plane,
431 enum omap_channel channel); 432 enum omap_channel channel);
432 433