diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-10 13:13:15 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-29 11:44:39 +0100 |
| commit | 04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7 (patch) | |
| tree | 28cd5c3bff61e7f4c9ffcc279a7a2d91ff84a46b | |
| parent | OMAPDSS: DISPC: make _enable_mgr_out public as "dispc_mgr_enable" (diff) | |
| download | linux-04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7.tar.xz linux-04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7.zip | |
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>
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 5 | ||||
| -rw-r--r-- | drivers/video/omap2/dss/dss.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index b5cdbaf61f07..3fd60ce3d718 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) return 0; } +bool dispc_ovl_enabled(enum omap_plane plane) +{ + return REG_GET(DISPC_OVL_ATTRIBUTES(plane), 0, 0); +} + static void dispc_mgr_disable_isr(void *data, u32 mask) { struct completion *compl = data; diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 85c6fc8cec1d..e3e5a63dacec 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, bool replication, const struct omap_video_timings *mgr_timings, bool mem_to_mem); int dispc_ovl_enable(enum omap_plane plane, bool enable); +bool dispc_ovl_enabled(enum omap_plane plane); void dispc_ovl_set_channel_out(enum omap_plane plane, enum omap_channel channel); |