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

Commit de02b49a 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: add nrt vbif register dump in xlog output"

parents c2e38a43 615314e0

drivers/video/msm/mdss/mdss_dsi_host.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

drivers/video/msm/mdss/mdss_fb.c

+4 −4
Original line number Diff line number Diff line
@@ -2906,8 +2906,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");
@@ -2935,8 +2935,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");

drivers/video/msm/mdss/mdss_mdp_intf_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -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++;