Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (909f5c10) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde_dbg.c

+25 −13

Original line number	Diff line number	Diff line
		@@ -3450,7 +3450,7 @@ static void _sde_dump_reg(const char *dump_name, u32 reg_dump_flag,

		if (dump_mem && *dump_mem) {
		dump_addr = *dump_mem;
		dev_info(sde_dbg_base.dev,
		dev_dbg(sde_dbg_base.dev,
		"%s: start_addr:0x%pK len:0x%x reg_offset=0x%lx\n",
		dump_name, dump_addr, len_padded,
		(unsigned long)(addr - base_addr));
		@@ -3563,14 +3563,19 @@ static void _sde_dump_reg_by_ranges(struct sde_dbg_reg_base *dbg,
		char *addr;
		size_t len;
		struct sde_dbg_reg_range *range_node;
		bool in_log = false;

		if (!dbg \|\| !(dbg->base \|\| dbg->cb)) {
		pr_err("dbg base is null!\n");
		return;
		}

		dev_info(sde_dbg_base.dev, "%s:=========%s DUMP=========\n", __func__,
		dbg->name);
		in_log = reg_dump_flag & SDE_DBG_DUMP_IN_LOG;

		if (in_log)
		dev_info(sde_dbg_base.dev, "%s:========= %s DUMP=========\n",
		__func__, dbg->name);

		if (dbg->cb) {
		dbg->cb(dbg->cb_ptr);
		/* If there is a list to dump the registers by ranges, use the ranges */
		@@ -3598,10 +3603,12 @@ static void _sde_dump_reg_by_ranges(struct sde_dbg_reg_base *dbg,
		}
		} else {
		/* If there is no list to dump ranges, dump all registers */
		if (in_log) {
		dev_info(sde_dbg_base.dev,
		"Ranges not found, will dump full registers\n");
		dev_info(sde_dbg_base.dev, "base:0x%pK len:0x%zx\n", dbg->base,
		dbg->max_offset);
		dev_info(sde_dbg_base.dev, "base:0x%pK len:0x%zx\n",
		dbg->base, dbg->max_offset);
		}
		addr = dbg->base;
		len = dbg->max_offset;
		_sde_dump_reg(dbg->name, reg_dump_flag, dbg->base, addr, len,
		@@ -3723,6 +3730,7 @@ static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)

		if (*dump_mem) {
		dump_addr = *dump_mem;
		if (in_log)
		dev_info(sde_dbg_base.dev,
		"%s: start_addr:0x%pK len:0x%x\n",
		__func__, dump_addr, list_size);
		@@ -3884,6 +3892,7 @@ static void _sde_dbg_dump_vbif_dbg_bus(struct sde_dbg_vbif_debug_bus *bus)

		if (*dump_mem) {
		dump_addr = *dump_mem;
		if (in_log)
		dev_info(sde_dbg_base.dev,
		"%s: start_addr:0x%pK len:0x%x\n",
		__func__, dump_addr, list_size);
		@@ -3989,13 +3998,16 @@ static void _sde_dump_array(struct sde_dbg_reg_base *blk_arr[],
		}
		}

		if (sde_dbg_base.enable_reg_dump & SDE_DBG_DUMP_IN_MEM)
		pr_info("=========Captured reg dump in memory=========\n");

		if (dump_dbgbus_sde)
		_sde_dbg_dump_sde_dbg_bus(&sde_dbg_base.dbgbus_sde);

		if (dump_dbgbus_vbif_rt)
		_sde_dbg_dump_vbif_dbg_bus(&sde_dbg_base.dbgbus_vbif_rt);

		if (sde_dbg_base.dsi_dbg_bus \|\| dump_all)
		if (sde_dbg_base.dsi_dbg_bus)
		dsi_ctrl_debug_dump(sde_dbg_base.dbgbus_dsi.entries,
		sde_dbg_base.dbgbus_dsi.size);