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

Commit 6a134412 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: reduce log level when ping pong timeout happens"

parents ab477f13 44e8e43c

drivers/video/msm/mdss/mdss_dsi_host.c

+1 −1
Original line number Diff line number Diff line
@@ -1948,7 +1948,7 @@ static int mdss_dsi_mdp_busy_tout_check(struct mdss_dsi_ctrl_pdata *ctrl) 


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

	if (isr & DSI_INTR_CMD_MDP_DONE) {

		WARN(1, "INTR_CMD_MDP_DONE set but isr not fired\n");

		pr_warn("INTR_CMD_MDP_DONE set but isr not fired\n");

		isr &= DSI_INTR_MASK_ALL;

		isr |= DSI_INTR_CMD_MDP_DONE; /* clear this isr only */

		MIPI_OUTP(ctrl->ctrl_base + 0x0110, isr);

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl *ctl, void *arg) 
		status = mask & readl_relaxed(ctl->mdata->mdp_base +

				MDSS_MDP_REG_INTR_STATUS);

		if (status) {

			WARN(1, "pp done but irq not triggered\n");

			pr_warn("pp done but irq not triggered\n");

			mdss_mdp_irq_clear(ctl->mdata,

					MDSS_MDP_IRQ_PING_PONG_COMP,

					ctx->pp_num);