Commit 194347df authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: inline DSC_BLK and DSC_BLK_1_2 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>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/545370/
Link: https://lore.kernel.org/r/20230704022136.130522-14-dmitry.baryshkov@linaro.org
parent 8d3e0dd0

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

+7 −2
Original line number Diff line number Diff line
@@ -200,8 +200,13 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = { 
};



static const struct dpu_dsc_cfg msm8998_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, 0),

	DSC_BLK("dsc_1", DSC_1, 0x80400, 0),

	{

		.name = "dsc_0", .id = DSC_0,

		.base = 0x80000, .len = 0x140,

	}, {

		.name = "dsc_1", .id = DSC_1,

		.base = 0x80400, .len = 0x140,

	},

};



static const struct dpu_dspp_cfg msm8998_dspp[] = {

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

+13 −4
Original line number Diff line number Diff line
@@ -224,10 +224,19 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = { 
};



static const struct dpu_dsc_cfg sdm845_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, 0),

	DSC_BLK("dsc_1", DSC_1, 0x80400, 0),

	DSC_BLK("dsc_2", DSC_2, 0x80800, 0),

	DSC_BLK("dsc_3", DSC_3, 0x80c00, 0),

	{

		.name = "dsc_0", .id = DSC_0,

		.base = 0x80000, .len = 0x140,

	}, {

		.name = "dsc_1", .id = DSC_1,

		.base = 0x80400, .len = 0x140,

	}, {

		.name = "dsc_2", .id = DSC_2,

		.base = 0x80800, .len = 0x140,

	}, {

		.name = "dsc_3", .id = DSC_3,

		.base = 0x80c00, .len = 0x140,

	},

};



static const struct dpu_intf_cfg sdm845_intf[] = {

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

+17 −4
Original line number Diff line number Diff line
@@ -245,10 +245,23 @@ static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = { 
};



static const struct dpu_dsc_cfg sm8150_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)),

	{

		.name = "dsc_0", .id = DSC_0,

		.base = 0x80000, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_1", .id = DSC_1,

		.base = 0x80400, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_2", .id = DSC_2,

		.base = 0x80800, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_3", .id = DSC_3,

		.base = 0x80c00, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	},

};



static const struct dpu_intf_cfg sm8150_intf[] = {

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

+25 −6
Original line number Diff line number Diff line
@@ -244,12 +244,31 @@ static const struct dpu_merge_3d_cfg sc8180x_merge_3d[] = { 
};



static const struct dpu_dsc_cfg sc8180x_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_4", DSC_4, 0x81000, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_5", DSC_5, 0x81400, BIT(DPU_DSC_OUTPUT_CTRL)),

	{

		.name = "dsc_0", .id = DSC_0,

		.base = 0x80000, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_1", .id = DSC_1,

		.base = 0x80400, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_2", .id = DSC_2,

		.base = 0x80800, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_3", .id = DSC_3,

		.base = 0x80c00, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_4", .id = DSC_4,

		.base = 0x81000, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_5", .id = DSC_5,

		.base = 0x81400, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	},

};



static const struct dpu_intf_cfg sc8180x_intf[] = {

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

+17 −4
Original line number Diff line number Diff line
@@ -245,10 +245,23 @@ static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = { 
};



static const struct dpu_dsc_cfg sm8250_dsc[] = {

	DSC_BLK("dsc_0", DSC_0, 0x80000, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_1", DSC_1, 0x80400, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_2", DSC_2, 0x80800, BIT(DPU_DSC_OUTPUT_CTRL)),

	DSC_BLK("dsc_3", DSC_3, 0x80c00, BIT(DPU_DSC_OUTPUT_CTRL)),

	{

		.name = "dsc_0", .id = DSC_0,

		.base = 0x80000, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_1", .id = DSC_1,

		.base = 0x80400, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_2", .id = DSC_2,

		.base = 0x80800, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	}, {

		.name = "dsc_3", .id = DSC_3,

		.base = 0x80c00, .len = 0x140,

		.features = BIT(DPU_DSC_OUTPUT_CTRL),

	},

};



static const struct dpu_intf_cfg sm8250_intf[] = {