Merge "msm: mdss: dsi: check ULPS state only for active lanes" (ef370787) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi.c

+19 −1

Original line number	Diff line number	Diff line
		@@ -443,7 +443,9 @@ static int mdss_dsi_ulps_config_sub(struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		{
		int ret = 0;
		struct mdss_panel_data *pdata = NULL;
		struct mipi_panel_info *pinfo = NULL;
		u32 lane_status = 0;
		u32 active_lanes = 0;

		if (!ctrl_pdata) {
		pr_err("%s: invalid input\n", __func__);
		@@ -451,6 +453,11 @@ static int mdss_dsi_ulps_config_sub(struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		}

		pdata = &ctrl_pdata->panel_data;
		if (!pdata) {
		pr_err("%s: Invalid panel data\n", __func__);
		return -EINVAL;
		}
		pinfo = &pdata->panel_info.mipi;

		if (!__mdss_dsi_ulps_feature_enabled(pdata)) {
		pr_debug("%s: ULPS feature not supported. enable=%d\n",
		@@ -486,8 +493,19 @@ static int mdss_dsi_ulps_config_sub(struct mdss_dsi_ctrl_pdata *ctrl_pdata,
		*/
		MIPI_OUTP(ctrl_pdata->ctrl_base + 0x0AC, 0x01F);
		usleep(100);

		/* Check to make sure that all active data lanes are in ULPS */
		if (pinfo->data_lane3)
		active_lanes \|= BIT(11);
		if (pinfo->data_lane2)
		active_lanes \|= BIT(10);
		if (pinfo->data_lane1)
		active_lanes \|= BIT(9);
		if (pinfo->data_lane0)
		active_lanes \|= BIT(8);
		active_lanes \|= BIT(12); /* clock lane */
		lane_status = MIPI_INP(ctrl_pdata->ctrl_base + 0xA8);
		if (lane_status & 0x1F00) {
		if (lane_status & active_lanes) {
		pr_err("%s: ULPS entry req failed. Lane status=0x%08x\n",
		__func__, lane_status);
		ret = -EINVAL;