Merge "msm: mdss: call MDSS_XLOG_TOUT_HANDLER at thread context" (6bf7b021) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_dsi_host.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1445,6 +1445,9 @@ static int dsi_event_thread(void *data)
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		}
		mutex_unlock(&ctrl->mutex);

		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"edp", "hdmi", "panic");
		}

		if (todo & DSI_EV_DSI_FIFO_EMPTY)
		@@ -1530,8 +1533,6 @@ void mdss_dsi_fifo_status(struct mdss_dsi_ctrl_pdata *ctrl)
		pr_err("%s: status=%x\n", __func__, status);
		if (status & 0x0080) /* CMD_DMA_FIFO_UNDERFLOW */
		dsi_send_events(ctrl, DSI_EV_MDP_FIFO_UNDERFLOW);
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"edp", "hdmi", "panic");
		if (status & 0x11110000) /* DLN_FIFO_EMPTY */
		dsi_send_events(ctrl, DSI_EV_DSI_FIFO_EMPTY);
		}