Merge "msm: dsi: fix dsi clock errors if ulps is disabled" (c67eb195) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/msm_mdss_io_8974.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1089,12 +1089,10 @@ static int mdss_dsi_ulps_config(struct mdss_dsi_ctrl_pdata *ctrl,
		pinfo = &pdata->panel_info;
		mipi = &pinfo->mipi;

		if (!mdss_dsi_ulps_feature_enabled(pdata) &&
		!pinfo->ulps_suspend_enabled &&
		(pinfo->blank_state != MDSS_PANEL_BLANK_BLANK)) {
		pr_debug("%s: ULPS feature not supported. enable=%d\n",
		__func__, enable);
		return -ENOTSUPP;
		if (!mdss_dsi_ulps_feature_enabled(pdata) \|\|
		!pinfo->ulps_suspend_enabled) {
		pr_debug("%s: ULPS feature is not enabled\n", __func__);
		return 0;
		}

		/*