From f56d607e33ad4bf04681be74cbb748b0c0c1dece Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 10 Oct 2012 14:13:15 +0300 Subject: [PATCH] --- yaml --- r: 344597 b: refs/heads/master c: 04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7 h: refs/heads/master i: 344595: 01e7507b507abcfcf5e2a81cce55c41c92e60751 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 5 +++++ trunk/drivers/video/omap2/dss/dss.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f4c21204de2c..c94f13c53bba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1a813d35f5aa53290814b2c646972b4e89c733e +refs/heads/master: 04bd8ac14e6c0d4f75be0950c14f9791ffdc76d7 diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index b5cdbaf61f07..3fd60ce3d718 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/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/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h index 85c6fc8cec1d..e3e5a63dacec 100644 --- a/trunk/drivers/video/omap2/dss/dss.h +++ b/trunk/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);