Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e8ad926 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: dsi: fix dsi fifo underflow error status check"

parents 3083ef48 8c85c34b

drivers/video/msm/mdss/mdss_dsi.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ struct dsi_err_container { 
#define DSI_CTRL_CLK_MASTER	DSI_CTRL_LEFT



#define DSI_EV_PLL_UNLOCKED		0x0001

#define DSI_EV_MDP_FIFO_UNDERFLOW	0x0002

#define DSI_EV_DLNx_FIFO_UNDERFLOW	0x0002

#define DSI_EV_DSI_FIFO_EMPTY		0x0004

#define DSI_EV_DLNx_FIFO_OVERFLOW	0x0008

#define DSI_EV_LP_RX_TIMEOUT		0x0010

drivers/video/msm/mdss/mdss_dsi_host.c

+4 −4
Original line number Diff line number Diff line
@@ -2589,7 +2589,7 @@ static int dsi_event_thread(void *data) 
		if (todo & DSI_EV_PLL_UNLOCKED)

			mdss_dsi_pll_relock(ctrl);



		if (todo & DSI_EV_MDP_FIFO_UNDERFLOW) {

		if (todo & DSI_EV_DLNx_FIFO_UNDERFLOW) {

			mutex_lock(&ctrl->mutex);

			if (ctrl->recovery) {

				pr_debug("%s: Handling underflow event\n",
@@ -2776,7 +2776,7 @@ void mdss_dsi_fifo_status(struct mdss_dsi_ctrl_pdata *ctrl) 
	status = MIPI_INP(base + 0x000c);/* DSI_FIFO_STATUS */



	/* fifo underflow, overflow and empty*/

	if (status & 0xcccc4489) {

	if (status & 0xcccc4409) {

		MIPI_OUTP(base + 0x000c, status);

		pr_err("%s: status=%x\n", __func__, status);

		if (status & 0x44440000) {/* DLNx_HS_FIFO_OVERFLOW */
@@ -2784,8 +2784,8 @@ void mdss_dsi_fifo_status(struct mdss_dsi_ctrl_pdata *ctrl) 
			/* Ignore FIFO EMPTY when overflow happens */

			status = status & 0xeeeeffff;

		}

		if (status & 0x0080)  /* CMD_DMA_FIFO_UNDERFLOW */

			dsi_send_events(ctrl, DSI_EV_MDP_FIFO_UNDERFLOW, 0);

		if (status & 0x88880000)  /* DLNx_HS_FIFO_UNDERFLOW */

			dsi_send_events(ctrl, DSI_EV_DLNx_FIFO_UNDERFLOW, 0);

		if (status & 0x11110000) /* DLN_FIFO_EMPTY */

			dsi_send_events(ctrl, DSI_EV_DSI_FIFO_EMPTY, 0);

		ctrl->err_cont.fifo_err_cnt++;