Commit b6a44e77 authored by Tomi Valkeinen's avatar Tomi Valkeinen

OMAPDSS: DISPC: Flush posted writes when enabling outputs

Flush posted write in _enable_lcd_out() and _enable_digit_out(). This
ensures the the lcd/digit bit is written before the code starts waiting
for interrupts about enabling/disabling the output.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 968f8e97
...@@ -1916,10 +1916,14 @@ static void dispc_disable_isr(void *data, u32 mask) ...@@ -1916,10 +1916,14 @@ static void dispc_disable_isr(void *data, u32 mask)
static void _enable_lcd_out(enum omap_channel channel, bool enable) static void _enable_lcd_out(enum omap_channel channel, bool enable)
{ {
if (channel == OMAP_DSS_CHANNEL_LCD2) if (channel == OMAP_DSS_CHANNEL_LCD2) {
REG_FLD_MOD(DISPC_CONTROL2, enable ? 1 : 0, 0, 0); REG_FLD_MOD(DISPC_CONTROL2, enable ? 1 : 0, 0, 0);
else /* flush posted write */
dispc_read_reg(DISPC_CONTROL2);
} else {
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0); REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 0, 0);
dispc_read_reg(DISPC_CONTROL);
}
} }
static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable) static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
...@@ -1967,6 +1971,8 @@ static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable) ...@@ -1967,6 +1971,8 @@ static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable)
static void _enable_digit_out(bool enable) static void _enable_digit_out(bool enable)
{ {
REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1); REG_FLD_MOD(DISPC_CONTROL, enable ? 1 : 0, 1, 1);
/* flush posted write */
dispc_read_reg(DISPC_CONTROL);
} }
static void dispc_mgr_enable_digit_out(bool enable) static void dispc_mgr_enable_digit_out(bool enable)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment