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

Commit 052c2e7c 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: change retire fence signaling"

parents e49fbdab d2b62bc6

drivers/video/msm/mdss/mdss_fb.c

+1 −1
Original line number Diff line number Diff line
@@ -3174,7 +3174,7 @@ static int mdss_fb_pan_display_ex(struct fb_info *info, 
	if (var->yoffset > (info->var.yres_virtual - info->var.yres))

		return -EINVAL;



	ret = mdss_fb_wait_for_kickoff(mfd);

	ret = mdss_fb_pan_idle(mfd);

	if (ret) {

		pr_err("wait_for_kick failed. rc=%d\n", ret);

		return ret;

drivers/video/msm/mdss/mdss_mdp_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -2900,7 +2900,6 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd, 
	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);



	mdss_mdp_check_ctl_reset_status(ctl);

	__vsync_set_vsync_handler(mfd);

	__validate_and_set_roi(mfd, data);



	if (ctl->ops.wait_pingpong && mdp5_data->mdata->serialize_wait4pp)
@@ -2954,6 +2953,7 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd, 
			&commit_cb);

		ATRACE_END("display_commit");

	}

	__vsync_set_vsync_handler(mfd);



	/*

	 * release the commit pending flag; we are releasing this flag