Ryan pointed out [1] that some (most) of of sub-blocks do not fill the field `name'. Further research showed that we can drop the fields `name' and `id' and further simplify the catalog. The handling code also usually knows, which sub-block it is now looking at. Drop unused field and arguments and merge some of sub-block declarations. I did not merge inter-generation VIG_SBLK definitions, this is pending another cleanup (which will also switch to using hardcoded scaler version). Dependencies: [2] [1] https://patchwork.freedesktop.org/patch/543903/?series=119773&rev=1 [2] https://patchwork.freedesktop.org/series/118839/ Dmitry Baryshkov (6): drm/msm/dpu: drop the `id' field from DPU_HW_SUBBLK_INFO drm/msm/dpu: drop the field `name' from DPU_HW_SUBBLK_INFO drm/msm/dpu: drop the `smart_dma_priority' field from struct dpu_sspp_sub_blks drm/msm/dpu: deduplicate some (most) of SSPP sub-blocks drm/msm/dpu: drop DPU_HW_SUBBLK_INFO macro drm/msm/dpu: merge dpu_csc_blk and dpu_dsc_blk into dpu_simple_blk Ryan McCann (1): drm/msm/dpu: Drop unused num argument from relevant macros .../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_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 | 122 +++++++----------- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 48 +++---- 17 files changed, 154 insertions(+), 200 deletions(-) -- 2.39.2
