]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
OMAPDSS: DISPC: make _enable_mgr_out public as "dispc_mgr_enable"
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 19 Oct 2012 11:16:06 +0000 (14:16 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 29 Oct 2012 10:44:39 +0000 (12:44 +0200)
We need a low level manager-enable function for omapdrm. We have that
function as dispc internal func, _enable_mgr_out().

This patch exposes that function, and renames it to dispc_mgr_enable().

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dss.h

index 600a4121c6d5e3c9e9e1bb01ffb7627bf65e0266..b5cdbaf61f07625d3eaeec54b24f2af1e07ef7fe 100644 (file)
@@ -2595,7 +2595,7 @@ static void dispc_mgr_disable_isr(void *data, u32 mask)
        complete(compl);
 }
 
-static void _enable_mgr_out(enum omap_channel channel, bool enable)
+void dispc_mgr_enable(enum omap_channel channel, bool enable)
 {
        mgr_fld_write(channel, DISPC_MGR_FLD_ENABLE, enable);
        /* flush posted write */
@@ -2609,7 +2609,7 @@ bool dispc_mgr_is_enabled(enum omap_channel channel)
 
 static void dispc_mgr_enable_lcd_out(enum omap_channel channel)
 {
-       _enable_mgr_out(channel, true);
+       dispc_mgr_enable(channel, true);
 }
 
 static void dispc_mgr_disable_lcd_out(enum omap_channel channel)
@@ -2633,7 +2633,7 @@ static void dispc_mgr_disable_lcd_out(enum omap_channel channel)
        if (r)
                DSSERR("failed to register FRAMEDONE isr\n");
 
-       _enable_mgr_out(channel, false);
+       dispc_mgr_enable(channel, false);
 
        /* if we couldn't register for framedone, just sleep and exit */
        if (r) {
@@ -2685,7 +2685,7 @@ static void dispc_mgr_enable_digit_out(void)
                return;
        }
 
-       _enable_mgr_out(OMAP_DSS_CHANNEL_DIGIT, true);
+       dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, true);
 
        /* wait for the first evsync */
        if (!wait_for_completion_timeout(&vsync_compl, msecs_to_jiffies(100)))
@@ -2735,7 +2735,7 @@ static void dispc_mgr_disable_digit_out(void)
        if (r)
                DSSERR("failed to register %x isr\n", irq_mask);
 
-       _enable_mgr_out(OMAP_DSS_CHANNEL_DIGIT, false);
+       dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, false);
 
        /* if we couldn't register the irq, just sleep and exit */
        if (r) {
index 687eddfc2eb34e573d45a0c69197a14bbb541081..85c6fc8cec1d9197264f8a7571a2a9cf0e39a238 100644 (file)
@@ -435,6 +435,7 @@ u32 dispc_mgr_get_framedone_irq(enum omap_channel channel);
 u32 dispc_mgr_get_sync_lost_irq(enum omap_channel channel);
 bool dispc_mgr_go_busy(enum omap_channel channel);
 void dispc_mgr_go(enum omap_channel channel);
+void dispc_mgr_enable(enum omap_channel channel, bool enable);
 bool dispc_mgr_is_enabled(enum omap_channel channel);
 void dispc_mgr_enable_sync(enum omap_channel channel);
 void dispc_mgr_disable_sync(enum omap_channel channel);