summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJimmy Rubin <jimmy.rubin@stericsson.com>2011-03-16 08:32:33 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:03:52 +0200
commit76dcd5e16e2abd51e5d91b9f327b4e76748953c4 (patch)
tree226a4fc5596a07c7a352f7509613bca778438b2c /drivers
parent6798688fc0cebbcb6bcf1a32d2c3081e88b3752c (diff)
video: mcde: Fix first refresh when rotated
When hardware_revision is 1_0_4 (U5500_V1) enable_channel must be executed before softwaretrig for the first refresh. ST-Ericsson Linux Next: Not tested, ER 282779 ST-Ericsson ID: 333074 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I0a5e87b16682ed1d3591e8aac09b032874a52e31 Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19524 Reviewed-by: Dan JOHANSSON <dan.johansson@stericsson.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mcde/mcde_hw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/mcde/mcde_hw.c b/drivers/video/mcde/mcde_hw.c
index 1542538e18d..69e4617d896 100644
--- a/drivers/video/mcde/mcde_hw.c
+++ b/drivers/video/mcde/mcde_hw.c
@@ -1501,13 +1501,14 @@ static void do_softwaretrig(struct mcde_chnl_state *chnl)
/*
* For main and secondary display,
* FLOWEN has to be set before a SOFTWARE TRIG
- * Otherwise not overlay interrupt is triggerd
+ * Otherwise no overlay interrupt is triggerd
* However FLOWEN must not be triggered before SOFTWARE TRIG
* if rotation is enabled
*/
if (hardware_version == MCDE_CHIP_VERSION_3_0_8)
enable_channel(chnl);
- else if ((!is_channel_enabled(chnl) && !chnl->regs.roten))
+ else if ((!is_channel_enabled(chnl) && !chnl->regs.roten)
+ || chnl->power_mode != MCDE_DISPLAY_PM_ON)
enable_channel(chnl);
mcde_wreg(MCDE_CHNL0SYNCHSW +