From 30460c971d507172ed928855ec64e5248ca121b5 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 12 Oct 2011 10:17:02 +0300 Subject: [PATCH] --- yaml --- r: 284885 b: refs/heads/master c: b6a44e7748527d01b0c2f9a67686babaf0a5e53b h: refs/heads/master i: 284883: d2fc1381af7ef49aab20ff06e8ac08e992e5d956 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fc3733d1d669..c60424cedfb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 968f8e97a3291a3c7c9a2dee1a85a092de638f65 +refs/heads/master: b6a44e7748527d01b0c2f9a67686babaf0a5e53b diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index 5c81533eacaa..5bbd838a657a 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -1916,10 +1916,14 @@ static void dispc_disable_isr(void *data, u32 mask) 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); - else + /* flush posted write */ + dispc_read_reg(DISPC_CONTROL2); + } else { 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) @@ -1967,6 +1971,8 @@ static void dispc_mgr_enable_lcd_out(enum omap_channel channel, bool enable) static void _enable_digit_out(bool enable) { 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)