diff options
| author | Ingrid Gallardo <ingridg@codeaurora.org> | 2016-03-06 18:08:15 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-25 16:03:22 -0700 |
| commit | 5119bb73261164b1ca502cdd452eac26f3a08dde (patch) | |
| tree | 50dc454f79aa76960edff70964d553f42fa83ed8 /drivers/video/fbdev | |
| parent | 6574604d8a740c73e72f03158ed12e81eb609473 (diff) | |
msm: mdss: fix to restore pp split config
Fix to restore the ping pong split configuration
after power collapse.
Change-Id: I9109081cbde941b55ee889707bda35af7d303cf0
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index f0f794edfcd2..294d2248ec83 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -3652,7 +3652,10 @@ void mdss_mdp_ctl_restore(bool locked) if (sctl) { mdss_mdp_ctl_restore_sub(sctl); mdss_mdp_ctl_split_display_enable(1, ctl, sctl); + } else if (is_pingpong_split(ctl->mfd)) { + mdss_mdp_ctl_pp_split_display_enable(1, ctl); } + if (ctl->ops.restore_fnc) ctl->ops.restore_fnc(ctl, locked); } diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index f9b225859c7d..950228e405a4 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -282,9 +282,10 @@ static int mdss_mdp_cmd_tearcheck_cfg(struct mdss_mdp_mixer *mixer, pr_debug("%s: yres=%d vclks=%x height=%d init=%d rd=%d start=%d\n", __func__, pinfo->yres, vclks_line, te->sync_cfg_height, - te->vsync_init_val, te->rd_ptr_irq, te->start_pos); - pr_debug("thrd_start =%d thrd_cont=%d\n", - te->sync_threshold_start, te->sync_threshold_continue); + te->vsync_init_val, te->rd_ptr_irq, te->start_pos); + pr_debug("thrd_start =%d thrd_cont=%d pp_split=%d\n", + te->sync_threshold_start, te->sync_threshold_continue, + ctx->pingpong_split_slave); pingpong_base = mixer->pingpong_base; |