On 2023-06-20 00:25:14, Dmitry Baryshkov wrote:
> 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: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Validated that this incurs no changes by checksumming a stripped
dpu_hw_catalog.o.
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> ---
> .../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 16 +++++++++++---
> .../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 16 +++++++++++---
> .../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 16 +++++++++++---
> .../msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 16 +++++++++++---
> .../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 16 +++++++++++---
> .../msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 21 +++++++++++++++----
> .../msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 21 +++++++++++++++----
> .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 11 ----------
> 8 files changed, 99 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> index 9b2de5986e82..0e09e759dc99 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
> @@ -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[] = {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
> index 683602e54c0e..4d2b0409a244 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
> @@ -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[] = {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> index a98d63f6c47c..50f857565dbf 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> @@ -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[] = {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> index 8a9bfc4af72a..0added438239 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> @@ -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,
> + },
> };
>
> /*
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
> index b676819db42c..0b4915dabe7a 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
> @@ -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,
> + },
> };
>
> /*
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
> index 568523abc1d0..45cda9162685 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h
> @@ -247,10 +247,23 @@ static const struct dpu_pingpong_cfg sm8450_pp[] = {
> };
>
> static const struct dpu_merge_3d_cfg sm8450_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),
> - MERGE_3D_BLK("merge_3d_3", MERGE_3D_3, 0x65f00),
> + {
> + .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,
> + }, {
> + .name = "merge_3d_3", .id = MERGE_3D_3,
> + .base = 0x65f00, .len = 0x8,
> + .features = MERGE_3D_SM8150_MASK,
> + },
> };
>
> /*
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> index 419624948e83..66dd414253f1 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> @@ -261,10 +261,23 @@ static const struct dpu_pingpong_cfg sm8550_pp[] = {
> };
>
> static const struct dpu_merge_3d_cfg sm8550_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),
> - MERGE_3D_BLK("merge_3d_3", MERGE_3D_3, 0x66700),
> + {
> + .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,
> + }, {
> + .name = "merge_3d_3", .id = MERGE_3D_3,
> + .base = 0x66700, .len = 0x8,
> + .features = MERGE_3D_SM8150_MASK,
> + },
> };
>
> /*
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index ee24402bf253..72634a8109e8 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -471,17 +471,6 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = {
> .intr_rdptr = _rdptr, \
> }
>
> -/*************************************************************
> - * MERGE_3D sub blocks config
> - *************************************************************/
> -#define MERGE_3D_BLK(_name, _id, _base) \
> - {\
> - .name = _name, .id = _id, \
> - .base = _base, .len = 0x8, \
> - .features = MERGE_3D_SM8150_MASK, \
> - .sblk = NULL \
> - }
> -
> /*************************************************************
> * DSC sub blocks config
> *************************************************************/
> --
> 2.39.2
>
