Merge "msm: mdss: wait for pp done when switching from ON to LP1" (d8af252b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -3354,8 +3354,18 @@ int mdss_mdp_cmd_stop(struct mdss_mdp_ctl *ctl, int panel_power_state)
		* mode.
		*/
		send_panel_events = true;
		if (mdss_panel_is_power_on_ulp(panel_power_state))
		if (mdss_panel_is_power_on_ulp(panel_power_state)) {
		turn_off_clocks = true;
		} else if (atomic_read(&ctx->koff_cnt)) {
		/*
		* Transition from interactive to low power
		* Wait for kickoffs to finish
		*/
		MDSS_XLOG(ctl->num, atomic_read(&ctx->koff_cnt));
		mdss_mdp_cmd_wait4pingpong(ctl, NULL);
		if (sctl)
		mdss_mdp_cmd_wait4pingpong(sctl, NULL);
		}
		} else {
		/* Transitions between low power and ultra low power */
		if (mdss_panel_is_power_on_ulp(panel_power_state)) {