Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01fc047a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: fix to restore pp split config"

parents e8467747 821a023e

drivers/video/msm/mdss/mdss_mdp_ctl.c

+3 −0
Original line number Diff line number Diff line
@@ -3648,7 +3648,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);

	}

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+4 −3
Original line number Diff line number Diff line
@@ -283,8 +283,9 @@ 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);

	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;