Commit e28db021 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: inline DSPP_BLK macros 



To simplify making changes to the hardware block definitions, expand
corresponding macros. This way making all the changes are more obvious
and visible in the source files.

Tested-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/545359/
Link: https://lore.kernel.org/r/20230704022136.130522-12-dmitry.baryshkov@linaro.org
parent ef7d0e8d

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h

+11 −4
Original line number Diff line number Diff line
@@ -174,10 +174,17 @@ static const struct dpu_dsc_cfg msm8998_dsc[] = { 
};



static const struct dpu_dspp_cfg msm8998_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,

		 &msm8998_dspp_sblk),

	DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK,

		 &msm8998_dspp_sblk),

	{

		.name = "dspp_0", .id = DSPP_0,

		.base = 0x54000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &msm8998_dspp_sblk,

	}, {

		.name = "dspp_1", .id = DSPP_1,

		.base = 0x56000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &msm8998_dspp_sblk,

	},

};



static const struct dpu_intf_cfg msm8998_intf[] = {

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h

+21 −8
Original line number Diff line number Diff line
@@ -152,14 +152,27 @@ static const struct dpu_lm_cfg sdm845_lm[] = { 
};



static const struct dpu_dspp_cfg sdm845_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_2", DSPP_2, 0x58000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_3", DSPP_3, 0x5a000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	{

		.name = "dspp_0", .id = DSPP_0,

		.base = 0x54000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_1", .id = DSPP_1,

		.base = 0x56000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_2", .id = DSPP_2,

		.base = 0x58000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_3", .id = DSPP_3,

		.base = 0x5a000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	},

};



static const struct dpu_pingpong_cfg sdm845_pp[] = {

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h

+21 −8
Original line number Diff line number Diff line
@@ -161,14 +161,27 @@ static const struct dpu_lm_cfg sm8150_lm[] = { 
};



static const struct dpu_dspp_cfg sm8150_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_2", DSPP_2, 0x58000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_3", DSPP_3, 0x5a000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	{

		.name = "dspp_0", .id = DSPP_0,

		.base = 0x54000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_1", .id = DSPP_1,

		.base = 0x56000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_2", .id = DSPP_2,

		.base = 0x58000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_3", .id = DSPP_3,

		.base = 0x5a000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	},

};



static const struct dpu_pingpong_cfg sm8150_pp[] = {

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h

+21 −8
Original line number Diff line number Diff line
@@ -160,14 +160,27 @@ static const struct dpu_lm_cfg sc8180x_lm[] = { 
};



static const struct dpu_dspp_cfg sc8180x_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_2", DSPP_2, 0x58000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_3", DSPP_3, 0x5a000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	{

		.name = "dspp_0", .id = DSPP_0,

		.base = 0x54000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_1", .id = DSPP_1,

		.base = 0x56000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_2", .id = DSPP_2,

		.base = 0x58000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_3", .id = DSPP_3,

		.base = 0x5a000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	},

};



static const struct dpu_pingpong_cfg sc8180x_pp[] = {

drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h

+21 −8
Original line number Diff line number Diff line
@@ -161,14 +161,27 @@ static const struct dpu_lm_cfg sm8250_lm[] = { 
};



static const struct dpu_dspp_cfg sm8250_dspp[] = {

	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_1", DSPP_1, 0x56000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_2", DSPP_2, 0x58000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	DSPP_BLK("dspp_3", DSPP_3, 0x5a000, DSPP_SC7180_MASK,

		 &sdm845_dspp_sblk),

	{

		.name = "dspp_0", .id = DSPP_0,

		.base = 0x54000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_1", .id = DSPP_1,

		.base = 0x56000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_2", .id = DSPP_2,

		.base = 0x58000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	}, {

		.name = "dspp_3", .id = DSPP_3,

		.base = 0x5a000, .len = 0x1800,

		.features = DSPP_SC7180_MASK,

		.sblk = &sdm845_dspp_sblk,

	},

};



static const struct dpu_pingpong_cfg sm8250_pp[] = {