This huge series attempts to restructure the DPU HW catalog into a manageable and reviewable data set. In order to ease review and testing I merged all the necessary fixes into this series. Also I cherry-picked & slightly fixed Konrad's patch adding size to the SSPP and INTF macros. First 6 patches clean up the catalog a bit in order to make it more suitable for refactoring. Second batch of 13 + 5 + 4 patches split the hw catalog entries into per-SoC files. Then the next 6 patches perform a post-split cleanup. They enable missing features, drop obvious duplicates, etc. Then 6 patches rename/inline existing macros to ease using them while adding support for new devices. And last 2 patches migrate HW catalog entries to be tied to the of_device_id rather than using HW revision to obtain one: in the email discussion of the previous revision of the patchset it was revealed that there exist different SoCs with the same DPU hw revision, but different fetures being enabled in the hardware. This pile of patches is submitted in a single batch to allow one to observe the final goal of the cleanup which otherwise might be hard to assess. Changes since v3: - Split the SSPP/INTF size patch into SSPP and INTF parts (Abhinav) - Dropped the deduplication part for now. Replaced that with _duplicating_ the data (Abhinav) - Reworked catalog/kms interface to bind data using device match table Changes since v2: - Fixed sc8280xp SSPP size to 0x2ac - Rebased on top of msm-next-lumag, dropped merged patches Changes since v1: - Picked up Konrad's patch - Picked up dependencies into the main series - Moved qseed3lite vs qseed4 patches into the fixes part - Fixed sm6115 in a similar manner. Dmitry Baryshkov (40): drm/msm/dpu: use CTL_SC7280_MASK for sm8450's ctl_0 drm/msm/dpu: constify DSC data structures drm/msm/dpu: mark remaining pp data as const drm/msm/dpu: move UBWC/memory configuration to separate struct drm/msm/dpu: split SM8550 catalog entry to the separate file drm/msm/dpu: split SM8450 catalog entry to the separate file drm/msm/dpu: split SC8280XP catalog entry to the separate file drm/msm/dpu: split SC7280 catalog entry to the separate file drm/msm/dpu: split SM8350 catalog entry to the separate file drm/msm/dpu: split SM6115 catalog entry to the separate file drm/msm/dpu: split QCM2290 catalog entry to the separate file drm/msm/dpu: split SC7180 catalog entry to the separate file drm/msm/dpu: split SM8250 catalog entry to the separate file drm/msm/dpu: split SC8180X catalog entry to the separate file drm/msm/dpu: split SM8150 catalog entry to the separate file drm/msm/dpu: split MSM8998 catalog entry to the separate file drm/msm/dpu: split SDM845 catalog entry to the separate file drm/msm/dpu: duplicate sdm845 catalog entries drm/msm/dpu: duplicate sc7180 catalog entries drm/msm/dpu: duplicate sm8150 catalog entries drm/msm/dpu: duplicate sm8250 catalog entries drm/msm/dpu: duplicate sm8350 catalog entries drm/msm/dpu: expand sc8180x catalog drm/msm/dpu: expand sc7180 catalog drm/msm/dpu: expand sm6115 catalog drm/msm/dpu: expand sm8550 catalog drm/msm/dpu: use defined symbol for sc8280xp's maxwidth drm/msm/dpu: catalog: add comments regarding DPU_CTL_SPLIT_DISPLAY drm/msm/dpu: enable DPU_CTL_SPLIT_DISPLAY for sc8280xp drm/msm/dpu: enable DSPP_2/3 for LM_2/3 on sm8450 drm/msm/dpu: drop duplicate vig_sblk instances drm/msm/dpu: enable DSPP and DSC on sc8180x drm/msm/dpu: inline IRQ_n_MASK defines drm/msm/dpu: rename INTF_foo_MASK to contain major DPU version drm/msm/dpu: rename CTL_foo_MASK to contain major DPU version drm/msm/dpu: rename VIG and DMA_foo_MASK to contain major DPU version drm/msm/dpu: rename MIXER_foo_MASK to contain major DPU version drm/msm/dpu: rename MERGE_3D_foo_MASK to contain major DPU version drm/msm/dpu: fetch DPU configuration from match data drm/msm/dpu: drop unused macros from hw catalog Konrad Dybcio (2): drm/msm/dpu: Allow variable SSPP_BLK size drm/msm/dpu: Allow variable INTF_BLK size .../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 210 ++ .../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 210 ++ .../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 237 ++ .../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 239 ++ .../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 244 ++ .../msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 156 ++ .../msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 131 + .../msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 122 + .../msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 226 ++ .../msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 158 ++ .../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 223 ++ .../msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 234 ++ .../msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 239 ++ .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2209 +---------------- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 89 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 18 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 42 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - 20 files changed, 2753 insertions(+), 2243 deletions(-) create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h -- 2.39.2
