diff options
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi_host.c | 8 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 8 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c index cf53b9858cd2..1b6779e5b9d8 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_host.c +++ b/drivers/video/fbdev/msm/mdss_dsi_host.c @@ -2219,8 +2219,8 @@ void mdss_dsi_cmd_mdp_busy(struct mdss_dsi_ctrl_pdata *ctrl) pr_err("%s: timeout error\n", __func__); MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy", "dsi1_ctrl", "dsi1_phy", - "vbif", "dbg_bus", "vbif_dbg_bus", - "panic"); + "vbif", "vbif_nrt", "dbg_bus", + "vbif_dbg_bus", "panic"); } } } @@ -2486,8 +2486,8 @@ static int dsi_event_thread(void *data) } mutex_unlock(&ctrl->mutex); MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", - "dsi0_phy", "dsi1_ctrl", "dsi1_phy", - "vbif", "dbg_bus", "vbif_dbg_bus", "panic"); + "dsi0_phy", "dsi1_ctrl", "dsi1_phy", "vbif", + "vbif_nrt", "dbg_bus", "vbif_dbg_bus", "panic"); } if (todo & DSI_EV_DSI_FIFO_EMPTY) diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 4224ec00d3bf..b6cf83e6f0ae 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -2907,8 +2907,8 @@ static int mdss_fb_pan_idle(struct msm_fb_data_type *mfd) pr_err("%pS: wait for idle timeout commits=%d\n", __builtin_return_address(0), atomic_read(&mfd->commits_pending)); - MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "dbg_bus", - "vbif_dbg_bus"); + MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "vbif_nrt", + "dbg_bus", "vbif_dbg_bus"); ret = -ETIMEDOUT; } else if (mfd->shutdown_pending) { pr_debug("Shutdown signalled\n"); @@ -2936,8 +2936,8 @@ static int mdss_fb_wait_for_kickoff(struct msm_fb_data_type *mfd) __builtin_return_address(0), atomic_read(&mfd->kickoff_pending), atomic_read(&mfd->commits_pending)); - MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "dbg_bus", - "vbif_dbg_bus"); + MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "vbif_nrt", + "dbg_bus", "vbif_dbg_bus"); ret = -ETIMEDOUT; } else if (mfd->shutdown_pending) { pr_debug("Shutdown signalled\n"); diff --git a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c index 5b29e2ec17db..9757fc5ad2e6 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c +++ b/drivers/video/fbdev/msm/mdss_mdp_intf_cmd.c @@ -1368,13 +1368,13 @@ static int mdss_mdp_cmd_wait4pingpong(struct mdss_mdp_ctl *ctl, void *arg) if (ctx->pp_timeout_report_cnt == 0) { MDSS_XLOG(0xbad); MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy", - "dsi1_ctrl", "dsi1_phy", "vbif", "dbg_bus", - "vbif_dbg_bus", "panic"); + "dsi1_ctrl", "dsi1_phy", "vbif", "vbif_nrt", + "dbg_bus", "vbif_dbg_bus", "panic"); } else if (ctx->pp_timeout_report_cnt == MAX_RECOVERY_TRIALS) { MDSS_XLOG(0xbad2); MDSS_XLOG_TOUT_HANDLER("mdp", "dsi0_ctrl", "dsi0_phy", - "dsi1_ctrl", "dsi1_phy", "vbif", "dbg_bus", - "vbif_dbg_bus", "panic"); + "dsi1_ctrl", "dsi1_phy", "vbif", "vbif_nrt", + "dbg_bus", "vbif_dbg_bus", "panic"); mdss_fb_report_panel_dead(ctl->mfd); } ctx->pp_timeout_report_cnt++; |