Merge "msm_shared: display: Setup MDSS/DSI registers for continuous splash support"
diff --git a/platform/msm_shared/mdp5.c b/platform/msm_shared/mdp5.c
index 3ab47a9..468969c 100644
--- a/platform/msm_shared/mdp5.c
+++ b/platform/msm_shared/mdp5.c
@@ -111,10 +111,6 @@
/* write active region size*/
mdp_rgb_size = (fb->height << 16) + fb->width;
- /* Ping-Pong done Tear Check Read/Write */
- /* Underrun(Interface 0/1/2/3) VSYNC Interrupt Enable */
- writel(0xFF777713, MDP_INTR_EN);
-
access_secure = restore_secure_cfg(SECURE_DEVICE_MDSS);
mdp_clk_gating_ctrl();
@@ -218,9 +214,10 @@
/* Ping-Pong done Tear Check Read/Write */
/* Underrun(Interface 0/1/2/3) VSYNC Interrupt Enable */
writel(0xFF777713, MDP_INTR_CLEAR);
- writel(0x00000000, MDP_INTR_EN);
}
+ writel(0x00000000, MDP_INTR_EN);
+
return NO_ERROR;
}
diff --git a/platform/msm_shared/mipi_dsi.c b/platform/msm_shared/mipi_dsi.c
index 7a1c4eb..f467427 100644
--- a/platform/msm_shared/mipi_dsi.c
+++ b/platform/msm_shared/mipi_dsi.c
@@ -862,9 +862,6 @@
int mipi_dsi_off()
{
- writel(0x01010101, DSI_INT_CTRL);
- writel(0x13FF3BFF, DSI_ERR_INT_MASK0);
-
if(!target_cont_splash_screen())
{
writel(0, DSI_CLK_CTRL);
@@ -875,7 +872,8 @@
writel(0x0001, DSI_SOFT_RESET);
writel(0x0000, DSI_SOFT_RESET);
writel(0, DSI_CTRL);
- }
+ } else
+ writel(0x0, DSI_INT_CTRL);
return NO_ERROR;
}