diff options
| author | Aravind Venkateswaran <aravindh@codeaurora.org> | 2014-07-23 15:54:53 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:32:14 -0700 |
| commit | c1bf05b92a43cdcce4da7ce7986fa882c40def28 (patch) | |
| tree | 12cdacbe86911ce582805b10da847084e956f969 /drivers/video/fbdev/msm | |
| parent | d86e4c96c1bf06658a252bdc02af351e7bcd6011 (diff) | |
msm: mdss: reset cont splash screen flag after notifying panel intf
Starting with commit a702d63198e3524740be22b66ce1933064174019, the
continuous splash screen feature flag for the secondary panel was also
disabled along with that of the primary panel. However, this should only
be done after notifying the interface drivers about the transition from
the splash screen to the boot animation. This is needed as the DSI panel
driver relies on this flag to avoid unnecessarily configuring the DSI
lanes in to the ultra low power state during this transition.
Change-Id: I59d312248c579d27913f23dc23e9c91a99549725
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev/msm')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_video.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index dd9bd6ba7453..8f9f5aa5750e 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -1479,10 +1479,6 @@ int mdss_mdp_wb_mixer_destroy(struct mdss_mdp_mixer *mixer) int mdss_mdp_ctl_splash_finish(struct mdss_mdp_ctl *ctl, bool handoff) { - struct mdss_mdp_ctl *sctl = mdss_mdp_get_split_ctl(ctl); - if (sctl) - sctl->panel_data->panel_info.cont_splash_enabled = 0; - switch (ctl->panel_data->panel_info.type) { case MIPI_VIDEO_PANEL: case EDP_PANEL: diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index 1d2e9b91856a..119a6aaa42e4 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -532,6 +532,7 @@ static int mdss_mdp_cmd_remove_vsync_handler(struct mdss_mdp_ctl *ctl, int mdss_mdp_cmd_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, bool handoff) { struct mdss_panel_data *pdata; + struct mdss_mdp_ctl *sctl = mdss_mdp_get_split_ctl(ctl); int ret = 0; pdata = ctl->panel_data; @@ -539,6 +540,8 @@ int mdss_mdp_cmd_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, bool handoff) mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_PANEL_CLK_CTRL, (void *)0); pdata->panel_info.cont_splash_enabled = 0; + if (sctl) + sctl->panel_data->panel_info.cont_splash_enabled = 0; return ret; } diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c index 490c93d59c67..2a42752af006 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c @@ -812,6 +812,7 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, int i, ret = 0, off; u32 data, flush; struct mdss_mdp_video_ctx *ctx; + struct mdss_mdp_ctl *sctl = mdss_mdp_get_split_ctl(ctl); off = 0; ctx = (struct mdss_mdp_video_ctx *) ctl->priv_data; @@ -823,6 +824,8 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, pdata = ctl->panel_data; pdata->panel_info.cont_splash_enabled = 0; + if (sctl) + sctl->panel_data->panel_info.cont_splash_enabled = 0; if (!handoff) { ret = mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_CONT_SPLASH_BEGIN, |