UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAPDSS: DISPC: make _enable_mgr_out public as "dispc_mgr_enable" 

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>
This commit is contained in:
Tomi Valkeinen 2012-10-19 14:16:06 +03:00
parent 3a979f8ad2
commit f1a813d35f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/omap2/dss/dispc.c
View File

@ -2595,7 +2595,7 @@ static void dispc_mgr_disable_isr(void *data, u32 mask)
complete(compl); 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); mgr_fld_write(channel, DISPC_MGR_FLD_ENABLE, enable);
/* flush posted write */ /* 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) 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) 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) if (r)
DSSERR("failed to register FRAMEDONE isr\n"); 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 we couldn't register for framedone, just sleep and exit */
if (r) { if (r) {
@ -2685,7 +2685,7 @@ static void dispc_mgr_enable_digit_out(void)
return; return;
} }
_enable_mgr_out(OMAP_DSS_CHANNEL_DIGIT, true); dispc_mgr_enable(OMAP_DSS_CHANNEL_DIGIT, true);
/* wait for the first evsync */ /* wait for the first evsync */
if (!wait_for_completion_timeout(&vsync_compl, msecs_to_jiffies(100))) 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) if (r)
DSSERR("failed to register %x isr\n", irq_mask); 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 we couldn't register the irq, just sleep and exit */
if (r) { if (r) {

1
drivers/video/omap2/dss/dss.h
View 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); u32 dispc_mgr_get_sync_lost_irq(enum omap_channel channel);
bool dispc_mgr_go_busy(enum omap_channel channel); bool dispc_mgr_go_busy(enum omap_channel channel);
void dispc_mgr_go(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); bool dispc_mgr_is_enabled(enum omap_channel channel);
void dispc_mgr_enable_sync(enum omap_channel channel); void dispc_mgr_enable_sync(enum omap_channel channel);
void dispc_mgr_disable_sync(enum omap_channel channel); void dispc_mgr_disable_sync(enum omap_channel channel);