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

Commit 2d2f7f0b 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: avoid fake ack and overflow errors during ESD"

parents f80fb521 088c7c74

drivers/video/fbdev/msm/mdss_dsi_host.c

+8 −3
Original line number Diff line number Diff line
@@ -2981,7 +2981,10 @@ bool mdss_dsi_ack_err_status(struct mdss_dsi_ctrl_pdata *ctrl) 
		 * warning message is ignored.

		 */

		if (ctrl->panel_data.panel_info.esd_check_enabled &&

			(ctrl->status_mode == ESD_BTA) && (status & 0x1008000))

			((ctrl->status_mode == ESD_BTA) ||

			 (ctrl->status_mode == ESD_REG) ||

			 (ctrl->status_mode == ESD_REG_NT35596)) &&

			 (status & 0x1008000))

			return false;



		pr_err("%s: status=%x\n", __func__, status);
@@ -3212,7 +3215,9 @@ irqreturn_t mdss_dsi_isr(int irq, void *ptr) 
		 * cleared.

		 */

		if (ctrl->panel_data.panel_info.esd_check_enabled &&

			(ctrl->status_mode == ESD_BTA) &&

			((ctrl->status_mode == ESD_BTA) ||

			 (ctrl->status_mode == ESD_REG) ||

			 (ctrl->status_mode == ESD_REG_NT35596)) &&

			 (ctrl->panel_mode == DSI_VIDEO_MODE)) {

			isr &= ~DSI_INTR_ERROR;

			/* clear only overflow */