Merge "msm: mdss: enable dsi clock during HS clock lane recovery" (5c8b862b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_host.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -517,6 +517,7 @@ static void mdss_dsi_wait_clk_lane_to_stop(struct mdss_dsi_ctrl_pdata *ctrl)
		static void mdss_dsi_start_hs_clk_lane(struct mdss_dsi_ctrl_pdata *ctrl)
		{
		mutex_lock(&ctrl->clk_lane_mutex);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
		if (ctrl->clk_lane_cnt) {
		pr_err("%s: ndx=%d do-wait, cnt=%d\n",
		__func__, ctrl->ndx, ctrl->clk_lane_cnt);
		@@ -528,6 +529,7 @@ static void mdss_dsi_start_hs_clk_lane(struct mdss_dsi_ctrl_pdata *ctrl)
		ctrl->clk_lane_cnt++;
		pr_debug("%s: ndx=%d, set_hs, cnt=%d\n", __func__,
		ctrl->ndx, ctrl->clk_lane_cnt);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		mutex_unlock(&ctrl->clk_lane_mutex);
		}

		@@ -544,6 +546,7 @@ static void mdss_dsi_stop_hs_clk_lane(struct mdss_dsi_ctrl_pdata *ctrl,
		unsigned long flags;

		mutex_lock(&ctrl->clk_lane_mutex);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
		if (ctrl->clk_lane_cnt != 1) {
		pr_err("%s: ndx=%d wait had been done, cnt=%d\n",
		__func__, ctrl->ndx, ctrl->clk_lane_cnt);
		@@ -587,6 +590,7 @@ release:
		pr_debug("%s: ndx=%d, cnt=%d\n", __func__,
		ctrl->ndx, ctrl->clk_lane_cnt);

		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		mutex_unlock(&ctrl->clk_lane_mutex);
		}