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

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

Merge "msm: dsi: Silence DSI phy lane 0 error during ulps exit"

parents 755c49dd 9b83bbd5

drivers/video/msm/mdss/mdss_dsi.h

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int mdss_dsi_bta_status_check(struct mdss_dsi_ctrl_pdata *ctrl); 
int mdss_dsi_reg_status_check(struct mdss_dsi_ctrl_pdata *ctrl);

bool __mdss_dsi_clk_enabled(struct mdss_dsi_ctrl_pdata *ctrl, u8 clk_type);

void mdss_dsi_ctrl_setup(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl, bool print_en);

void mdss_dsi_lp_cd_rx(struct mdss_dsi_ctrl_pdata *ctrl);

void mdss_dsi_get_hw_revision(struct mdss_dsi_ctrl_pdata *ctrl);

u32 mdss_dsi_panel_cmd_read(struct mdss_dsi_ctrl_pdata *ctrl, char cmd0,

drivers/video/msm/mdss/mdss_dsi_host.c

+4 −3
Original line number Diff line number Diff line
@@ -2390,7 +2390,7 @@ void mdss_dsi_timeout_status(struct mdss_dsi_ctrl_pdata *ctrl) 
	}

}



void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl)

void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl, bool print_en)

{

	u32 status;

	unsigned char *base;
@@ -2401,6 +2401,7 @@ void mdss_dsi_dln0_phy_err(struct mdss_dsi_ctrl_pdata *ctrl) 


	if (status & 0x011111) {

		MIPI_OUTP(base + 0x00b4, status);

		if (print_en)

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

	}

}
@@ -2473,7 +2474,7 @@ void mdss_dsi_error(struct mdss_dsi_ctrl_pdata *ctrl) 
	mdss_dsi_ack_err_status(ctrl);	/* mask0, 0x01f */

	mdss_dsi_timeout_status(ctrl);	/* mask0, 0x0e0 */

	mdss_dsi_status(ctrl);		/* mask0, 0xc0100 */

	mdss_dsi_dln0_phy_err(ctrl);	/* mask0, 0x3e00000 */

	mdss_dsi_dln0_phy_err(ctrl, true);	/* mask0, 0x3e00000 */



	/* clear dsi error interrupt */

	intr = MIPI_INP(ctrl->ctrl_base + 0x0110);

drivers/video/msm/mdss/msm_mdss_io_8974.c

+2 −2
Original line number Diff line number Diff line
@@ -1024,9 +1024,9 @@ static int mdss_dsi_ulps_config(struct mdss_dsi_ctrl_pdata *ctrl, 
		/*

		 * Clear out any phy errors prior to exiting ULPS

		 * This fixes certain instances where phy does not exit

		 * ULPS cleanly.

		 * ULPS cleanly. Also, do not print error during such cases.

		 */

		mdss_dsi_dln0_phy_err(ctrl);

		mdss_dsi_dln0_phy_err(ctrl, false);



		/*

		 * ULPS Exit Request