From 53f3da50509b29e608d0382e1cf5a9a21c59017b Mon Sep 17 00:00:00 2001 From: Huaibin Yang Date: Tue, 11 Nov 2014 14:13:12 -0800 Subject: [PATCH] msm: mdss: debugfs: xlog: fix block names for reg dump Update obsolete mdss block names to new ones for xlog register dump. Change-Id: Iae8859c42df45577bfccd5a939669742f8395ca2 Signed-off-by: Huaibin Yang Signed-off-by: Ingrid Gallardo --- drivers/video/fbdev/msm/mdss_debug_xlog.c | 7 ++++--- drivers/video/fbdev/msm/mdss_dsi_host.c | 17 ++++++++--------- drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 6 +++--- drivers/video/fbdev/msm/mdss_mdp_intf_video.c | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_debug_xlog.c b/drivers/video/fbdev/msm/mdss_debug_xlog.c index d7f51e175e94..2b277239af85 100644 --- a/drivers/video/fbdev/msm/mdss_debug_xlog.c +++ b/drivers/video/fbdev/msm/mdss_debug_xlog.c @@ -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; + } } } diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c index 1d762e34ee30..f6334754f5a0 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_host.c +++ b/drivers/video/fbdev/msm/mdss_dsi_host.c @@ -712,8 +712,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); @@ -783,8 +783,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); @@ -1908,8 +1908,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); @@ -2150,9 +2150,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) diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index d158db7993ab..df3d54ed9cb2 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -1,4 +1,4 @@ -/* 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; diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c index 924f280e00fc..ec0e3916e942 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_video.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_video.c @@ -1,4 +1,4 @@ -/* 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 @@ -649,7 +649,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);