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

Commit 73cf6aae authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "msm: mdss: dsi: enter ULPS after blanking the panel during suspend""

parents d48c0a96 ef4a8e60

drivers/video/msm/mdss/msm_mdss_io_8974.c

+13 −3
Original line number Diff line number Diff line
@@ -965,8 +965,7 @@ static int mdss_dsi_ulps_config(struct mdss_dsi_ctrl_pdata *ctrl, 
	mipi = &pinfo->mipi;



	if (!mdss_dsi_ulps_feature_enabled(pdata) &&

		!pinfo->ulps_suspend_enabled &&

		(pinfo->blank_state != MDSS_PANEL_BLANK_BLANK)) {

		!pinfo->ulps_suspend_enabled) {

		pr_debug("%s: ULPS feature not supported. enable=%d\n",

			__func__, enable);

		return -ENOTSUPP;
@@ -1382,7 +1381,18 @@ static int mdss_dsi_clk_ctrl_sub(struct mdss_dsi_ctrl_pdata *ctrl, 
		}

	} else {

		if (clk_type & DSI_LINK_CLKS) {

			/*

			 * If ULPS feature is enabled, enter ULPS first.

			 * If ULPS during suspend is not enabled, no need

			 * to enable ULPS when turning off the clocks

			 * while blanking the panel.

			 */

			if (((mdss_dsi_ulps_feature_enabled(pdata)) &&

				(pdata->panel_info.blank_state !=

				 MDSS_PANEL_BLANK_BLANK)) ||

				(pdata->panel_info.ulps_suspend_enabled))

				mdss_dsi_ulps_config(ctrl, 1);



			mdss_dsi_link_clk_stop(ctrl);

		}

		if (clk_type & DSI_BUS_CLKS) {