Merge "msm: mdss: serialize wait for pingpong with kickoff" (0d8bfae5) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ static void mdss_mdp_cmd_wait4_autorefresh_pp(struct mdss_mdp_ctl *ctl)
		return;
		}

		if (line_out < ctl->mixer_left->roi.h) {
		if ((line_out < ctl->mixer_left->roi.h) && (line_out)) {
		reinit_completion(&ctx->autorefresh_ppdone);

		/* enable ping pong done */
		@@ -2510,6 +2510,7 @@ int mdss_mdp_cmd_set_autorefresh_mode(struct mdss_mdp_ctl *mctl, int frame_cnt)
		*/
		ctx->autorefresh_state = MDP_AUTOREFRESH_ON_REQUESTED;
		ctx->autorefresh_frame_cnt = frame_cnt;
		mctl->mdata->serialize_wait4pp = true;

		/* Cancel GATE Work Item */
		if (cancel_work_sync(&ctx->gate_clk_work))
		@@ -2523,8 +2524,10 @@ int mdss_mdp_cmd_set_autorefresh_mode(struct mdss_mdp_ctl *mctl, int frame_cnt)
		if (frame_cnt == 0) {
		ctx->autorefresh_state = MDP_AUTOREFRESH_OFF;
		ctx->autorefresh_frame_cnt = 0;
		mctl->mdata->serialize_wait4pp = false;
		} else {
		ctx->autorefresh_frame_cnt = frame_cnt;
		mctl->mdata->serialize_wait4pp = true;
		}
		break;
		case MDP_AUTOREFRESH_ON:
		@@ -2536,6 +2539,7 @@ int mdss_mdp_cmd_set_autorefresh_mode(struct mdss_mdp_ctl *mctl, int frame_cnt)
		ctx->autorefresh_state = MDP_AUTOREFRESH_OFF_REQUESTED;
		} else {
		ctx->autorefresh_frame_cnt = frame_cnt;
		mctl->mdata->serialize_wait4pp = true;
		}
		break;
		case MDP_AUTOREFRESH_OFF_REQUESTED:
		@@ -2545,6 +2549,7 @@ int mdss_mdp_cmd_set_autorefresh_mode(struct mdss_mdp_ctl *mctl, int frame_cnt)
		pr_debug("cancelling autorefresh off request\n");
		ctx->autorefresh_state = MDP_AUTOREFRESH_ON;
		ctx->autorefresh_frame_cnt = frame_cnt;
		mctl->mdata->serialize_wait4pp = true;
		}
		break;
		default:
		@@ -2873,6 +2878,7 @@ static int mdss_mdp_disable_autorefresh(struct mdss_mdp_ctl *ctl,
		cfg \|= BIT(20);
		mdss_mdp_pingpong_write(pp_base,
		MDSS_MDP_REG_PP_SYNC_CONFIG_VSYNC, cfg);
		ctl->mdata->serialize_wait4pp = false;

		return 0;
		}