Merge "msm: mdss: avoid kickoff wait during validation phase" (6a8def73) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdp3_ctrl.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -3045,6 +3045,7 @@ int mdp3_ctrl_init(struct msm_fb_data_type *mfd)
		goto init_done;
		}

		mfd->skip_koff_wait = true;
		mdp3_session->dma->output_config.out_sel = intf_type;
		mdp3_session->mfd = mfd;
		mdp3_session->panel = dev_get_platdata(&mfd->pdev->dev);

+29 −26

Original line number	Diff line number	Diff line
		@@ -3388,20 +3388,24 @@ int mdss_fb_atomic_commit(struct fb_info *info,

		commit_v1 = &commit->commit_v1;
		if (commit_v1->flags & MDP_VALIDATE_LAYER) {
		if (!mfd->skip_koff_wait) {
		ret = mdss_fb_wait_for_kickoff(mfd);
		if (ret) {
		pr_err("wait for kickoff failed\n");
		} else {
		goto end;
		}
		}
		__ioctl_transition_dyn_mode_state(mfd,
		MSMFB_ATOMIC_COMMIT, true, false);
		if (mfd->panel.type == WRITEBACK_PANEL) {
		output_layer = commit_v1->output_layer;
		output_layer = (struct mdp_output_layer *)
		commit_v1->output_layer;
		if (!output_layer) {
		pr_err("Output layer is null\n");
		goto end;
		}
		wb_change = !mdss_fb_is_wb_config_same(mfd,
		commit_v1->output_layer);
		output_layer);
		if (wb_change) {
		old_xres = pinfo->xres;
		old_yres = pinfo->yres;
		@@ -3415,7 +3419,6 @@ int mdss_fb_atomic_commit(struct fb_info *info,
		ret = mfd->mdp.atomic_validate(mfd, file, commit_v1);
		if (!ret)
		mfd->atomic_commit_pending = true;
		}
		goto end;
		} else {
		ret = mdss_fb_pan_idle(mfd);

+1 −0