Merge "drm/msm: fix issue dumping sde registers" into msm-4.9 (ca2c15c7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ static int _sde_encoder_phys_cmd_handle_ppdone_timeout(
		atomic_read(&phys_enc->pending_kickoff_cnt));

		SDE_DBG_DUMP("sde", "dsi0_ctrl", "dsi0_phy", "dsi1_ctrl",
		"dsi1_phy", "vbif", "vbif_nrt", "dbg_bus",
		"dsi1_phy", "vbif", "dbg_bus",
		"vbif_dbg_bus", "panic");
		}

+9 −5

Original line number	Diff line number	Diff line
		@@ -1974,6 +1974,9 @@ static void _sde_dump_reg(const char dump_name, u32 reg_dump_flag, char addr,
		char *end_addr;
		int i;

		if (!len_bytes)
		return;

		in_log = (reg_dump_flag & SDE_DBG_DUMP_IN_LOG);
		in_mem = (reg_dump_flag & SDE_DBG_DUMP_IN_MEM);

		@@ -2446,8 +2449,12 @@ void sde_dbg_dump(bool queue_work, const char *name, ...)
		sizeof(sde_dbg_base.req_dump_blks));

		va_start(args, name);
		for (i = 0; i < SDE_EVTLOG_MAX_DATA; i++) {
		blk_name = va_arg(args, char*);
		i = 0;
		while ((blk_name = va_arg(args, char*))) {
		if (i++ >= SDE_EVTLOG_MAX_DATA) {
		pr_err("could not parse all dump arguments\n");
		break;
		}
		if (IS_ERR_OR_NULL(blk_name))
		break;

		@@ -2471,9 +2478,6 @@ void sde_dbg_dump(bool queue_work, const char *name, ...)
		if (!strcmp(blk_name, "panic"))
		do_panic = true;
		}
		blk_name = va_arg(args, char*);
		if (!IS_ERR_OR_NULL(blk_name))
		pr_err("could not parse all dump arguments\n");
		va_end(args);

		if (queue_work) {