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

Commit 95db3e5b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: fix register debug range printing"

parents b57c5ed7 92aa0b1f

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

+38 −26
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 
	sblk->maxdwnscale = MAX_SSPP_DOWNSCALE;

	sblk->format_list = plane_formats_yuv;

	sspp->id = SSPP_VIG0 + *vig_count;

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u", sspp->id);

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u",

			sspp->id - SSPP_VIG0);

	sspp->clk_ctrl = SDE_CLK_CTRL_VIG0 + *vig_count;

	sspp->type = SSPP_TYPE_VIG;

	set_bit(SDE_SSPP_QOS, &sspp->features);
@@ -736,7 +737,7 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 
		sblk->scaler_blk.len = PROP_VALUE_ACCESS(prop_value,

			VIG_QSEED_LEN, 0);

		snprintf(sblk->scaler_blk.name, SDE_HW_BLK_NAME_LEN,

				"sspp_scaler%u", sspp->id);

				"sspp_scaler%u", sspp->id - SSPP_VIG0);

	} else if (sde_cfg->qseed_type == SDE_SSPP_SCALER_QSEED3) {

		set_bit(SDE_SSPP_SCALER_QSEED3, &sspp->features);

		sblk->scaler_blk.id = SDE_SSPP_SCALER_QSEED3;
@@ -745,12 +746,12 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 
		sblk->scaler_blk.len = PROP_VALUE_ACCESS(prop_value,

			VIG_QSEED_LEN, 0);

		snprintf(sblk->scaler_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_scaler%u", sspp->id);

			"sspp_scaler%u", sspp->id - SSPP_VIG0);

	}



	sblk->csc_blk.id = SDE_SSPP_CSC;

	snprintf(sblk->csc_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_csc%u", sspp->id);

			"sspp_csc%u", sspp->id - SSPP_VIG0);

	if (sde_cfg->csc_type == SDE_SSPP_CSC) {

		set_bit(SDE_SSPP_CSC, &sspp->features);

		sblk->csc_blk.base = PROP_VALUE_ACCESS(prop_value,
@@ -763,7 +764,7 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 


	sblk->hsic_blk.id = SDE_SSPP_HSIC;

	snprintf(sblk->hsic_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_hsic%u", sspp->id);

			"sspp_hsic%u", sspp->id - SSPP_VIG0);

	if (prop_exists[VIG_HSIC_PROP]) {

		sblk->hsic_blk.base = PROP_VALUE_ACCESS(prop_value,

			VIG_HSIC_PROP, 0);
@@ -775,7 +776,7 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 


	sblk->memcolor_blk.id = SDE_SSPP_MEMCOLOR;

	snprintf(sblk->memcolor_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_memcolor%u", sspp->id);

			"sspp_memcolor%u", sspp->id - SSPP_VIG0);

	if (prop_exists[VIG_MEMCOLOR_PROP]) {

		sblk->memcolor_blk.base = PROP_VALUE_ACCESS(prop_value,

			VIG_MEMCOLOR_PROP, 0);
@@ -787,7 +788,7 @@ static void _sde_sspp_setup_vig(struct sde_mdss_cfg *sde_cfg, 


	sblk->pcc_blk.id = SDE_SSPP_PCC;

	snprintf(sblk->pcc_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_pcc%u", sspp->id);

			"sspp_pcc%u", sspp->id - SSPP_VIG0);

	if (prop_exists[VIG_PCC_PROP]) {

		sblk->pcc_blk.base = PROP_VALUE_ACCESS(prop_value,

			VIG_PCC_PROP, 0);
@@ -807,7 +808,8 @@ static void _sde_sspp_setup_rgb(struct sde_mdss_cfg *sde_cfg, 
	sblk->maxdwnscale = MAX_SSPP_DOWNSCALE;

	sblk->format_list = plane_formats;

	sspp->id = SSPP_RGB0 + *rgb_count;

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u", sspp->id);

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u",

			sspp->id - SSPP_VIG0);

	sspp->clk_ctrl = SDE_CLK_CTRL_RGB0 + *rgb_count;

	sspp->type = SSPP_TYPE_RGB;

	set_bit(SDE_SSPP_QOS, &sspp->features);
@@ -824,7 +826,7 @@ static void _sde_sspp_setup_rgb(struct sde_mdss_cfg *sde_cfg, 
		sblk->scaler_blk.len = PROP_VALUE_ACCESS(prop_value,

			RGB_SCALER_LEN, 0);

		snprintf(sblk->scaler_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_scaler%u", sspp->id);

			"sspp_scaler%u", sspp->id - SSPP_VIG0);

	} else if (sde_cfg->qseed_type == SDE_SSPP_SCALER_QSEED3) {

		set_bit(SDE_SSPP_SCALER_RGB, &sspp->features);

		sblk->scaler_blk.id = SDE_SSPP_SCALER_QSEED3;
@@ -833,7 +835,7 @@ static void _sde_sspp_setup_rgb(struct sde_mdss_cfg *sde_cfg, 
		sblk->scaler_blk.len = PROP_VALUE_ACCESS(prop_value,

			SSPP_SCALE_SIZE, 0);

		snprintf(sblk->scaler_blk.name, SDE_HW_BLK_NAME_LEN,

			"sspp_scaler%u", sspp->id);

			"sspp_scaler%u", sspp->id - SSPP_VIG0);

	}



	sblk->pcc_blk.id = SDE_SSPP_PCC;
@@ -857,7 +859,8 @@ static void _sde_sspp_setup_cursor(struct sde_mdss_cfg *sde_cfg, 
	sblk->maxdwnscale = SSPP_UNITY_SCALE;

	sblk->format_list = cursor_formats;

	sspp->id = SSPP_CURSOR0 + *cursor_count;

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u", sspp->id);

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u",

			sspp->id - SSPP_VIG0);

	sspp->clk_ctrl = SDE_CLK_CTRL_CURSOR0 + *cursor_count;

	sspp->type = SSPP_TYPE_CURSOR;

	(*cursor_count)++;
@@ -874,7 +877,8 @@ static void _sde_sspp_setup_dma(struct sde_mdss_cfg *sde_cfg, 
	sspp->id = SSPP_DMA0 + *dma_count;

	sspp->clk_ctrl = SDE_CLK_CTRL_DMA0 + *dma_count;

	sspp->type = SSPP_TYPE_DMA;

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u", sspp->id);

	snprintf(sspp->name, SDE_HW_BLK_NAME_LEN, "sspp_%u",

			sspp->id - SSPP_VIG0);

	set_bit(SDE_SSPP_QOS, &sspp->features);

	(*dma_count)++;

	snprintf(sspp->name, sizeof(sspp->name), "dma%d", *dma_count-1);
@@ -978,8 +982,6 @@ static int sde_sspp_parse_dt(struct device_node *np, 


		set_bit(SDE_SSPP_SRC, &sspp->features);

		sblk->src_blk.id = SDE_SSPP_SRC;

		snprintf(sblk->src_blk.name, SDE_HW_BLK_NAME_LEN, "sspp_src_%u",

				sblk->src_blk.id);



		of_property_read_string_index(np,

				sspp_prop[SSPP_TYPE].prop_name, i, &type);
@@ -1104,7 +1106,8 @@ static int sde_ctl_parse_dt(struct device_node *np, 
		ctl->base = PROP_VALUE_ACCESS(prop_value, HW_OFF, i);

		ctl->len = PROP_VALUE_ACCESS(prop_value, HW_LEN, 0);

		ctl->id = CTL_0 + i;

		snprintf(ctl->name, SDE_HW_BLK_NAME_LEN, "ctl_%u", ctl->id);

		snprintf(ctl->name, SDE_HW_BLK_NAME_LEN, "ctl_%u",

				ctl->id - CTL_0);



		if (i < MAX_SPLIT_DISPLAY_CTL)

			set_bit(SDE_CTL_SPLIT_DISPLAY, &ctl->features);
@@ -1196,7 +1199,8 @@ static int sde_mixer_parse_dt(struct device_node *np, 
		mixer->base = PROP_VALUE_ACCESS(prop_value, MIXER_OFF, i);

		mixer->len = PROP_VALUE_ACCESS(prop_value, MIXER_LEN, 0);

		mixer->id = LM_0 + i;

		snprintf(mixer->name, SDE_HW_BLK_NAME_LEN, "lm_%u", mixer->id);

		snprintf(mixer->name, SDE_HW_BLK_NAME_LEN, "lm_%u",

				mixer->id - LM_0);



		if (!prop_exists[MIXER_LEN])

			mixer->len = DEFAULT_SDE_HW_BLOCK_LEN;
@@ -1284,7 +1288,8 @@ static int sde_intf_parse_dt(struct device_node *np, 
		intf->base = PROP_VALUE_ACCESS(prop_value, INTF_OFF, i);

		intf->len = PROP_VALUE_ACCESS(prop_value, INTF_LEN, 0);

		intf->id = INTF_0 + i;

		snprintf(intf->name, SDE_HW_BLK_NAME_LEN, "intf_%u", intf->id);

		snprintf(intf->name, SDE_HW_BLK_NAME_LEN, "intf_%u",

				intf->id - INTF_0);



		if (!prop_exists[INTF_LEN])

			intf->len = DEFAULT_SDE_HW_BLOCK_LEN;
@@ -1365,7 +1370,8 @@ static int sde_wb_parse_dt(struct device_node *np, 


		wb->base = PROP_VALUE_ACCESS(prop_value, WB_OFF, i);

		wb->id = WB_0 + PROP_VALUE_ACCESS(prop_value, WB_ID, i);

		snprintf(wb->name, SDE_HW_BLK_NAME_LEN, "wb_%u", wb->id);

		snprintf(wb->name, SDE_HW_BLK_NAME_LEN, "wb_%u",

				wb->id - WB_0);

		wb->clk_ctrl = SDE_CLK_CTRL_WB0 +

			PROP_VALUE_ACCESS(prop_value, WB_ID, i);

		wb->xin_id = PROP_VALUE_ACCESS(prop_value, WB_XIN_ID, i);
@@ -1601,7 +1607,8 @@ static int sde_dspp_parse_dt(struct device_node *np, 
		dspp->base = PROP_VALUE_ACCESS(prop_value, DSPP_OFF, i);

		dspp->len = PROP_VALUE_ACCESS(prop_value, DSPP_SIZE, 0);

		dspp->id = DSPP_0 + i;

		snprintf(dspp->name, SDE_HW_BLK_NAME_LEN, "dspp_%u", dspp->id);

		snprintf(dspp->name, SDE_HW_BLK_NAME_LEN, "dspp_%u",

				dspp->id - DSPP_0);



		sblk = kzalloc(sizeof(*sblk), GFP_KERNEL);

		if (!sblk) {
@@ -1671,7 +1678,8 @@ static int sde_cdm_parse_dt(struct device_node *np, 
		cdm = sde_cfg->cdm + i;

		cdm->base = PROP_VALUE_ACCESS(prop_value, HW_OFF, i);

		cdm->id = CDM_0 + i;

		snprintf(cdm->name, SDE_HW_BLK_NAME_LEN, "cdm_%u", cdm->id);

		snprintf(cdm->name, SDE_HW_BLK_NAME_LEN, "cdm_%u",

				cdm->id - CDM_0);

		cdm->len = PROP_VALUE_ACCESS(prop_value, HW_LEN, 0);



		/* intf3 and wb2 for cdm block */
@@ -1737,6 +1745,8 @@ static int sde_vbif_parse_dt(struct device_node *np, 
		vbif->base = PROP_VALUE_ACCESS(prop_value, VBIF_OFF, i);

		vbif->len = vbif_len;

		vbif->id = VBIF_0 + PROP_VALUE_ACCESS(prop_value, VBIF_ID, i);

		snprintf(vbif->name, SDE_HW_BLK_NAME_LEN, "vbif_%u",

				vbif->id - VBIF_0);



		SDE_DEBUG("vbif:%d\n", vbif->id - VBIF_0);
@@ -1864,19 +1874,21 @@ static int sde_pp_parse_dt(struct device_node *np, 


		pp->base = PROP_VALUE_ACCESS(prop_value, PP_OFF, i);

		pp->id = PINGPONG_0 + i;

		snprintf(pp->name, SDE_HW_BLK_NAME_LEN, "pingpong_%u", pp->id);

		snprintf(pp->name, SDE_HW_BLK_NAME_LEN, "pingpong_%u",

				pp->id - PINGPONG_0);

		pp->len = PROP_VALUE_ACCESS(prop_value, PP_LEN, 0);



		sblk->te.base = PROP_VALUE_ACCESS(prop_value, TE_OFF, i);

		sblk->te.id = SDE_PINGPONG_TE;

		snprintf(sblk->te.name, SDE_HW_BLK_NAME_LEN, "te_%u", pp->id);

		snprintf(sblk->te.name, SDE_HW_BLK_NAME_LEN, "te_%u",

				pp->id - PINGPONG_0);

		set_bit(SDE_PINGPONG_TE, &pp->features);



		sblk->te2.base = PROP_VALUE_ACCESS(prop_value, TE2_OFF, i);

		if (sblk->te2.base) {

			sblk->te2.id = SDE_PINGPONG_TE2;

			snprintf(sblk->te2.name, SDE_HW_BLK_NAME_LEN, "te2_%u",

					pp->id);

					pp->id - PINGPONG_0);

			set_bit(SDE_PINGPONG_TE2, &pp->features);

			set_bit(SDE_PINGPONG_SPLIT, &pp->features);

		}
@@ -1888,7 +1900,7 @@ static int sde_pp_parse_dt(struct device_node *np, 
		if (sblk->dsc.base) {

			sblk->dsc.id = SDE_PINGPONG_DSC;

			snprintf(sblk->dsc.name, SDE_HW_BLK_NAME_LEN, "dsc_%u",

					pp->id);

					sblk->dsc.id - PINGPONG_0);

			set_bit(SDE_PINGPONG_DSC, &pp->features);

		}

	}
@@ -2020,12 +2032,12 @@ static int sde_parse_dt(struct device_node *np, struct sde_mdss_cfg *cfg) 
	cfg->mdss[0].base = MDSS_BASE_OFFSET;

	cfg->mdss[0].id = MDP_TOP;

	snprintf(cfg->mdss[0].name, SDE_HW_BLK_NAME_LEN, "mdss_%u",

			cfg->mdss[0].id);

			cfg->mdss[0].id - MDP_TOP);



	cfg->mdp_count = 1;

	cfg->mdp[0].id = MDP_TOP;

	snprintf(cfg->mdp[0].name, SDE_HW_BLK_NAME_LEN, "top_%u",

		cfg->mdp[0].id);

		cfg->mdp[0].id - MDP_TOP);

	cfg->mdp[0].base = PROP_VALUE_ACCESS(prop_value, SDE_OFF, 0);

	cfg->mdp[0].len = PROP_VALUE_ACCESS(prop_value, SDE_LEN, 0);

	if (!prop_exists[SDE_LEN])

drivers/gpu/drm/msm/sde/sde_hw_catalog.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define SDE_HW_VER_172	SDE_HW_VER(1, 7, 2) /* 8996 v3.0 */

#define SDE_HW_VER_300	SDE_HW_VER(3, 0, 0) /* 8998 v1.0 */

#define SDE_HW_VER_301	SDE_HW_VER(3, 0, 1) /* 8998 v1.1 */

#define SDE_HW_VER_400	SDE_HW_VER(4, 0, 0) /* msmskunk v1.0 */

#define SDE_HW_VER_400	SDE_HW_VER(4, 0, 0) /* sdm845 v1.0 */



#define IS_MSMSKUNK_TARGET(rev) IS_SDE_MAJOR_MINOR_SAME((rev), SDE_HW_VER_400)

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

+3 −2
Original line number Diff line number Diff line
@@ -946,8 +946,9 @@ struct sde_hw_pipe *sde_hw_sspp_init(enum sde_sspp idx, 
	if (cfg->sblk->scaler_blk.len)

		sde_dbg_reg_register_dump_range(SDE_DBG_NAME,

			cfg->sblk->scaler_blk.name,

			cfg->sblk->scaler_blk.base,

			cfg->sblk->scaler_blk.base + cfg->sblk->scaler_blk.len,

			hw_pipe->hw.blk_off + cfg->sblk->scaler_blk.base,

			hw_pipe->hw.blk_off + cfg->sblk->scaler_blk.base +

				cfg->sblk->scaler_blk.len,

			hw_pipe->hw.xin_id);



	return hw_pipe;

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

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ struct sde_hw_mdp *sde_hw_mdptop_init(enum sde_mdp idx, 
	sde_dbg_reg_register_dump_range(SDE_DBG_NAME, cfg->name,

			mdp->hw.blk_off, mdp->hw.blk_off + mdp->hw.length,

			mdp->hw.xin_id);

	sde_dbg_set_sde_top_offset(mdp->hw.blk_off);



	return mdp;

}

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

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ struct sde_hw_vbif *sde_hw_vbif_init(enum sde_vbif idx, 
	c->cap = cfg;

	_setup_vbif_ops(&c->ops, c->cap->features);



	sde_dbg_reg_register_dump_range(SDE_DBG_NAME, cfg->name, c->hw.blk_off,

			c->hw.blk_off + c->hw.length, c->hw.xin_id);

	/* no need to register sub-range in sde dbg, dump entire vbif io base */



	return c;

}