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

Commit bcc3489d 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: Wait for vsync before iommu attach during cont splash"

parents 5593593b 0a25157d

drivers/video/msm/mdss/mdss_mdp_intf_video.c

+7 −0
Original line number Diff line number Diff line
@@ -693,6 +693,7 @@ static int mdss_mdp_video_display(struct mdss_mdp_ctl *ctl, void *arg) 
{

	struct mdss_mdp_video_ctx *ctx;

	struct mdss_mdp_ctl *sctl;

	struct mdss_panel_data *pdata = ctl->panel_data;

	int rc;



	pr_debug("kickoff ctl=%d\n", ctl->num);
@@ -725,6 +726,12 @@ static int mdss_mdp_video_display(struct mdss_mdp_ctl *ctl, void *arg) 


		pr_debug("enabling timing gen for intf=%d\n", ctl->intf_num);



		if (pdata->panel_info.cont_splash_enabled &&

			!ctl->mfd->splash_info.splash_logo_enabled) {

			rc = wait_for_completion_timeout(&ctx->vsync_comp,

					usecs_to_jiffies(VSYNC_TIMEOUT_US));

		}



		rc = mdss_iommu_ctrl(1);

		if (IS_ERR_VALUE(rc)) {

			pr_err("IOMMU attach failed\n");