Merge "msm: mdss: add xlog for debug in ping_pong timeout" (389464b2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1553,10 +1553,10 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl ctl, void arg)

	if (rc <= 0) {		if (rc <= 0) {
	u32 status, mask;		u32 status, mask;

	mask = BIT(MDSS_MDP_IRQ_PING_PONG_COMP + ctx->current_pp_num);		mask = BIT(MDSS_MDP_IRQ_PING_PONG_COMP + ctx->current_pp_num);
	status = mask & readl_relaxed(ctl->mdata->mdp_base +		status = mask & readl_relaxed(ctl->mdata->mdp_base +
	MDSS_MDP_REG_INTR_STATUS);		MDSS_MDP_REG_INTR_STATUS);
			MDSS_XLOG(status, atomic_read(&ctx->koff_cnt), rc);
	if (status) {		if (status) {
	pr_warn("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_clear(ctl->mdata,
	@@ -1572,9 +1572,10 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl ctl, void arg)
	}		}

	if (rc <= 0) {		if (rc <= 0) {
	pr_err("%s: wait4pingpong timed out. ctl=%d rc=%d cnt=%d\n",		pr_err("%s:wait4pingpong timed out ctl=%d rc=%d cnt=%d koff_cnt=%d\n",
	__func__,		__func__,
	ctl->num, rc, ctx->pp_timeout_report_cnt);		ctl->num, rc, ctx->pp_timeout_report_cnt,
			atomic_read(&ctx->koff_cnt));
	if (ctx->pp_timeout_report_cnt == 0) {		if (ctx->pp_timeout_report_cnt == 0) {
	MDSS_XLOG(0xbad);		MDSS_XLOG(0xbad);
	MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",