Commit 8d3e0dd0 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: inline LM_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 avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/545362/
Link: https://lore.kernel.org/r/20230704022136.130522-13-dmitry.baryshkov@linaro.org
parent e28db021

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

+43 −12
Original line number Diff line number Diff line
@@ -139,18 +139,49 @@ static const struct dpu_sspp_cfg msm8998_sspp[] = { 
};



static const struct dpu_lm_cfg msm8998_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_0, LM_1, DSPP_0),

	LM_BLK("lm_1", LM_1, 0x45000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_1, LM_0, DSPP_1),

	LM_BLK("lm_2", LM_2, 0x46000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_2, LM_5, 0),

	LM_BLK("lm_3", LM_3, 0x47000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_NONE, 0, 0),

	LM_BLK("lm_4", LM_4, 0x48000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_NONE, 0, 0),

	LM_BLK("lm_5", LM_5, 0x49000, MIXER_MSM8998_MASK,

		&msm8998_lm_sblk, PINGPONG_3, LM_2, 0),

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.lm_pair = LM_1,

		.pingpong = PINGPONG_0,

		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.lm_pair = LM_0,

		.pingpong = PINGPONG_1,

		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.pingpong = PINGPONG_NONE,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.pingpong = PINGPONG_NONE,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.features = MIXER_MSM8998_MASK,

		.sblk = &msm8998_lm_sblk,

		.lm_pair = LM_2,

		.pingpong = PINGPONG_3,

	},

};



static const struct dpu_pingpong_cfg msm8998_pp[] = {

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

+45 −12
Original line number Diff line number Diff line
@@ -137,18 +137,51 @@ static const struct dpu_sspp_cfg sdm845_sspp[] = { 
};



static const struct dpu_lm_cfg sdm845_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),

	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),

	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_2, LM_5, DSPP_2),

	LM_BLK("lm_3", LM_3, 0x0, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_NONE, 0, DSPP_3),

	LM_BLK("lm_4", LM_4, 0x0, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_NONE, 0, 0),

	LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_3, LM_2, 0),

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,

		.pingpong = PINGPONG_0,

		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,

		.pingpong = PINGPONG_1,

		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_2,

		.dspp = DSPP_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x0, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.pingpong = PINGPONG_NONE,

		.dspp = DSPP_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x0, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.pingpong = PINGPONG_NONE,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,

		.pingpong = PINGPONG_3,

	},

};



static const struct dpu_dspp_cfg sdm845_dspp[] = {

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

+45 −12
Original line number Diff line number Diff line
@@ -146,18 +146,51 @@ static const struct dpu_sspp_cfg sm8150_sspp[] = { 
};



static const struct dpu_lm_cfg sm8150_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),

	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),

	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_2, LM_3, 0),

	LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_3, LM_2, 0),

	LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_4, LM_5, 0),

	LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_5, LM_4, 0),

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,

		.pingpong = PINGPONG_0,

		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,

		.pingpong = PINGPONG_1,

		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,

		.pingpong = PINGPONG_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,

		.pingpong = PINGPONG_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

		.pingpong = PINGPONG_5,

	},

};



static const struct dpu_dspp_cfg sm8150_dspp[] = {

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

+45 −12
Original line number Diff line number Diff line
@@ -145,18 +145,51 @@ static const struct dpu_sspp_cfg sc8180x_sspp[] = { 
};



static const struct dpu_lm_cfg sc8180x_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),

	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),

	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_2, LM_3, 0),

	LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_3, LM_2, 0),

	LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_4, LM_5, 0),

	LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_5, LM_4, 0),

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,

		.pingpong = PINGPONG_0,

		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,

		.pingpong = PINGPONG_1,

		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,

		.pingpong = PINGPONG_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,

		.pingpong = PINGPONG_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

		.pingpong = PINGPONG_5,

	},

};



static const struct dpu_dspp_cfg sc8180x_dspp[] = {

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

+45 −12
Original line number Diff line number Diff line
@@ -146,18 +146,51 @@ static const struct dpu_sspp_cfg sm8250_sspp[] = { 
};



static const struct dpu_lm_cfg sm8250_lm[] = {

	LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),

	LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),

	LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_2, LM_3, 0),

	LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_3, LM_2, 0),

	LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_4, LM_5, 0),

	LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,

		&sdm845_lm_sblk, PINGPONG_5, LM_4, 0),

	{

		.name = "lm_0", .id = LM_0,

		.base = 0x44000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_1,

		.pingpong = PINGPONG_0,

		.dspp = DSPP_0,

	}, {

		.name = "lm_1", .id = LM_1,

		.base = 0x45000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_0,

		.pingpong = PINGPONG_1,

		.dspp = DSPP_1,

	}, {

		.name = "lm_2", .id = LM_2,

		.base = 0x46000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_3,

		.pingpong = PINGPONG_2,

	}, {

		.name = "lm_3", .id = LM_3,

		.base = 0x47000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_2,

		.pingpong = PINGPONG_3,

	}, {

		.name = "lm_4", .id = LM_4,

		.base = 0x48000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_5,

		.pingpong = PINGPONG_4,

	}, {

		.name = "lm_5", .id = LM_5,

		.base = 0x49000, .len = 0x320,

		.features = MIXER_SDM845_MASK,

		.sblk = &sdm845_lm_sblk,

		.lm_pair = LM_4,

		.pingpong = PINGPONG_5,

	},

};



static const struct dpu_dspp_cfg sm8250_dspp[] = {