Merge "msm: mdss: reset intf_stopped flag for sctl when exiting LP states" (b975545e) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1700,6 +1700,8 @@ static int mdss_mdp_cmd_panel_on(struct mdss_mdp_ctl *ctl,
		CTL_INTF_EVENT_FLAG_DEFAULT);

		ctx->intf_stopped = 0;
		if (sctx)
		sctx->intf_stopped = 0;
		} else {
		pr_err("%s: Panel already on\n", __func__);
		}
		@@ -2088,6 +2090,7 @@ static int mdss_mdp_cmd_stop_sub(struct mdss_mdp_ctl *ctl,
		int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		{
		struct mdss_mdp_cmd_ctx *ctx = ctl->intf_ctx[MASTER_CTX];
		struct mdss_mdp_cmd_ctx *sctx;
		struct mdss_mdp_ctl *sctl = mdss_mdp_get_split_ctl(ctl);
		bool panel_off = false;
		bool turn_off_clocks = false;
		@@ -2113,6 +2116,9 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		pr_debug("%s: transition from %d --> %d\n", __func__,
		ctx->panel_power_state, panel_power_state);

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

		if (ctl->cmd_autorefresh_en) {
		int pre_suspend = ctx->autorefresh_pending_frame_cnt;
		int hz, rc;
		@@ -2174,6 +2180,9 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		(void *)&ctx->intf_recovery,
		CTL_INTF_EVENT_FLAG_DEFAULT);
		ctx->intf_stopped = 0;
		if (sctx)
		sctx->intf_stopped = 0;

		goto end;
		}
		}