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

Commit 7a1822a4 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: flush timing after splash done for video panel"

parents fc0f8e4f d5ee4681

drivers/video/fbdev/msm/mdss_mdp_intf_video.c

+8 −3
Original line number Diff line number Diff line
@@ -1671,7 +1671,7 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, 
	struct mdss_panel_data *pdata;

	int i, ret = 0, off;

	u32 data, flush;

	struct mdss_mdp_video_ctx *ctx;

	struct mdss_mdp_video_ctx *ctx, *sctx = NULL;

	struct mdss_mdp_ctl *sctl;



	if (!ctl) {
@@ -1695,10 +1695,13 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, 
	pdata->panel_info.cont_splash_enabled = 0;

	sctl = mdss_mdp_get_split_ctl(ctl);



	if (sctl)

	if (sctl) {

		sctl->panel_data->panel_info.cont_splash_enabled = 0;

	else if (ctl->panel_data->next && is_pingpong_split(ctl->mfd))

		sctx = (struct mdss_mdp_video_ctx *) sctl->intf_ctx[MASTER_CTX];

	} else if (ctl->panel_data->next && is_pingpong_split(ctl->mfd)) {

		ctl->panel_data->next->panel_info.cont_splash_enabled = 0;

		sctx = (struct mdss_mdp_video_ctx *) ctl->intf_ctx[SLAVE_CTX];

	}



	if (!handoff) {

		ret = mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_CONT_SPLASH_BEGIN,
@@ -1724,6 +1727,8 @@ int mdss_mdp_video_reconfigure_splash_done(struct mdss_mdp_ctl *ctl, 
		mdss_mdp_ctl_write(ctl, MDSS_MDP_REG_CTL_FLUSH, flush);



		mdp_video_write(ctx, MDSS_MDP_REG_INTF_TIMING_ENGINE_EN, 0);

		mdss_mdp_video_timegen_flush(ctl, sctx);



		/* wait for 1 VSYNC for the pipe to be unstaged */

		msleep(20);