Merge "msm: mdss: debugfs: xlog: fix block names for reg dump" (e5f930a3) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_debug_xlog.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -186,9 +186,10 @@ static void mdss_dump_reg_by_blk(const char *blk_name)

		list_for_each_entry_safe(blk_base, tmp, &mdd->base_list, head) {
		if (blk_base->name &&
		!strcmp(blk_base->name, blk_name))
		mdss_dump_reg(blk_base,
		mdss_dbg_xlog.enable_reg_dump);
		!strcmp(blk_base->name, blk_name)) {
		mdss_dump_reg(blk_base, mdss_dbg_xlog.enable_reg_dump);
		break;
		}
		}
		}

drivers/video/msm/mdss/mdss_dsi_host.c

+9 −10

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -705,8 +705,8 @@ static void mdss_dsi_ctl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl)
		MDSS_XLOG(ctrl0->ndx, ln0, 0x1f1f);
		MDSS_XLOG(ctrl1->ndx, ln1, 0x1f1f);
		pr_err("Clock lane still in stop state");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		}
		pr_debug("%s: lane ctrl, ctrl0 = 0x%x, ctrl1 = 0x%x\n",
		__func__, ln0, ln1);
		@@ -776,8 +776,8 @@ static void mdss_dsi_ctl_phy_reset(struct mdss_dsi_ctrl_pdata *ctrl)
		if (i == loop) {
		MDSS_XLOG(ctrl->ndx, ln0, 0x1f1f);
		pr_err("Clock lane still in stop state");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		}
		pr_debug("%s: lane status = 0x%x\n",
		__func__, ln0);
		@@ -1891,8 +1891,8 @@ void mdss_dsi_cmd_mdp_busy(struct mdss_dsi_ctrl_pdata *ctrl)
		if (!wait_for_completion_timeout(&ctrl->mdp_comp,
		msecs_to_jiffies(DMA_TX_TIMEOUT))) {
		pr_err("%s: timeout error\n", __func__);
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"edp", "hdmi", "panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		}
		}
		pr_debug("%s: done pid=%d\n", __func__, current->pid);
		@@ -2134,9 +2134,8 @@ static int dsi_event_thread(void *data)
		mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
		}
		mutex_unlock(&ctrl->mutex);

		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"edp", "hdmi", "panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		}

		if (todo & DSI_EV_DSI_FIFO_EMPTY)

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -634,8 +634,8 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl ctl, void arg)
		if (!ctx->pp_timeout_report_cnt) {
		WARN(1, "cmd kickoff timed out (%d) ctl=%d\n",
		rc, ctl->num);
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1",
		"edp", "hdmi", "panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		}
		ctx->pp_timeout_report_cnt++;
		rc = -EPERM;

drivers/video/msm/mdss/mdss_mdp_intf_video.c

+3 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -634,7 +634,8 @@ static void mdss_mdp_video_underrun_intr_done(void *arg)

		ctl->underrun_cnt++;
		MDSS_XLOG(ctl->num, ctl->underrun_cnt);
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0", "dsi1", "edp", "hdmi", "panic");
		MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy",
		"dsi1_ctrl", "dsi1_phy", "panic");
		trace_mdp_video_underrun_done(ctl->num, ctl->underrun_cnt);
		pr_debug("display underrun detected for ctl=%d count=%d\n", ctl->num,
		ctl->underrun_cnt);