Commit 4fe37d2d authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: inline MERGE_3D_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/545382/
Link: https://lore.kernel.org/r/20230704022136.130522-15-dmitry.baryshkov@linaro.org
parent 194347df

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

+13 −3
Original line number Diff line number Diff line
@@ -239,9 +239,19 @@ static const struct dpu_pingpong_cfg sm8150_pp[] = { 
};



static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = {

	MERGE_3D_BLK("merge_3d_0", MERGE_3D_0, 0x83000),

	MERGE_3D_BLK("merge_3d_1", MERGE_3D_1, 0x83100),

	MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x83200),

	{

		.name = "merge_3d_0", .id = MERGE_3D_0,

		.base = 0x83000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_1", .id = MERGE_3D_1,

		.base = 0x83100, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_2", .id = MERGE_3D_2,

		.base = 0x83200, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	},

};



static const struct dpu_dsc_cfg sm8150_dsc[] = {

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

+13 −3
Original line number Diff line number Diff line
@@ -238,9 +238,19 @@ static const struct dpu_pingpong_cfg sc8180x_pp[] = { 
};



static const struct dpu_merge_3d_cfg sc8180x_merge_3d[] = {

	MERGE_3D_BLK("merge_3d_0", MERGE_3D_0, 0x83000),

	MERGE_3D_BLK("merge_3d_1", MERGE_3D_1, 0x83100),

	MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x83200),

	{

		.name = "merge_3d_0", .id = MERGE_3D_0,

		.base = 0x83000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_1", .id = MERGE_3D_1,

		.base = 0x83100, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_2", .id = MERGE_3D_2,

		.base = 0x83200, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	},

};



static const struct dpu_dsc_cfg sc8180x_dsc[] = {

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

+13 −3
Original line number Diff line number Diff line
@@ -239,9 +239,19 @@ static const struct dpu_pingpong_cfg sm8250_pp[] = { 
};



static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = {

	MERGE_3D_BLK("merge_3d_0", MERGE_3D_0, 0x83000),

	MERGE_3D_BLK("merge_3d_1", MERGE_3D_1, 0x83100),

	MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x83200),

	{

		.name = "merge_3d_0", .id = MERGE_3D_0,

		.base = 0x83000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_1", .id = MERGE_3D_1,

		.base = 0x83100, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_2", .id = MERGE_3D_2,

		.base = 0x83200, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	},

};



static const struct dpu_dsc_cfg sm8250_dsc[] = {

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

+13 −3
Original line number Diff line number Diff line
@@ -237,9 +237,19 @@ static const struct dpu_pingpong_cfg sm8350_pp[] = { 
};



static const struct dpu_merge_3d_cfg sm8350_merge_3d[] = {

	MERGE_3D_BLK("merge_3d_0", MERGE_3D_0, 0x4e000),

	MERGE_3D_BLK("merge_3d_1", MERGE_3D_1, 0x4f000),

	MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x50000),

	{

		.name = "merge_3d_0", .id = MERGE_3D_0,

		.base = 0x4e000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_1", .id = MERGE_3D_1,

		.base = 0x4f000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_2", .id = MERGE_3D_2,

		.base = 0x50000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	},

};



/*

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

+13 −3
Original line number Diff line number Diff line
@@ -235,9 +235,19 @@ static const struct dpu_pingpong_cfg sc8280xp_pp[] = { 
};



static const struct dpu_merge_3d_cfg sc8280xp_merge_3d[] = {

	MERGE_3D_BLK("merge_3d_0", MERGE_3D_0, 0x4e000),

	MERGE_3D_BLK("merge_3d_1", MERGE_3D_1, 0x4f000),

	MERGE_3D_BLK("merge_3d_2", MERGE_3D_2, 0x50000),

	{

		.name = "merge_3d_0", .id = MERGE_3D_0,

		.base = 0x4e000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_1", .id = MERGE_3D_1,

		.base = 0x4f000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	}, {

		.name = "merge_3d_2", .id = MERGE_3D_2,

		.base = 0x50000, .len = 0x8,

		.features = MERGE_3D_SM8150_MASK,

	},

};



/*