On 9/11/2023 2:45 PM, Dmitry Baryshkov wrote:
As we have dropped the variadic parts of SSPP sub-blocks declarations,
deduplicate them now, reducing memory cruft.
Signed-off-by: Dmitry Baryshkov <[email protected]>
---
.../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 16 +--
.../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 16 +--
.../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_5_4_sm6125.h | 6 +-
.../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 16 +--
.../msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 8 +-
.../msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 4 +-
.../msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 8 +-
.../msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 4 +-
.../msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 4 +-
.../msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 16 +--
.../msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 8 +-
.../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 16 +--
.../msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 16 +--
.../msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 20 ++--
.../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 97 +++++--------------
17 files changed, 120 insertions(+), 167 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
index ff83bf694fee..1276981c16d2 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
@@ -69,7 +69,7 @@ static const struct dpu_sspp_cfg msm8998_sspp[] = {
.name = "sspp_0", .id = SSPP_VIG0,
.base = 0x4000, .len = 0x1ac,
.features = VIG_MSM8998_MASK,
- .sblk = &msm8998_vig_sblk_0,
+ .sblk = &dpu_vig_sblk_1_2,
Thats a lot of de-duplication which is nice!
I think dpu_vig_sblk_scaler_x_y is a better name for all of these
because it indicates that its the scaler version which is different.
