Merge "msm: mdss: Avoid unclocked register access with dsi_event_thread" (35e54c70) · 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
		@@ -1431,8 +1431,10 @@ static int dsi_event_thread(void *data)

		if (todo & DSI_EV_MDP_FIFO_UNDERFLOW) {
		if (ctrl->recovery) {
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
		mdss_dsi_sw_reset_restore(ctrl);
		ctrl->recovery->fxn(ctrl->recovery->data);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		}
		}

		@@ -1444,7 +1446,9 @@ static int dsi_event_thread(void *data)
		spin_unlock_irqrestore(&ctrl->mdp_lock, flag);

		/* enable dsi error interrupt */
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
		mdss_dsi_err_intr_ctrl(ctrl, DSI_INTR_ERROR_MASK, 1);
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		}

		}