The handling code also usually knows, which sub-block it is now looking
at. Drop unused 'id' field and arguments and merge some of sub-block
declarations.
While we are at it, also fix all VIG subblocks to contain correct scaler
block version and drop the becoming unused QSEED-related feature bits.
Changes since v6:
- Renamed the merged DPU_SSPP_SCALER_QSEED3 to
DPU_SSPP_SCALER_QSEED3_COMPATIBLE (Abhinav)
Changes since v5:
- Fixed the rogue vig_qseed3_noscale sblk. There is no qseed3 in the
noscale VIG blocks.
Changes since v4:
- Renamed dpu_vig_sblk_x_y to dpu_vig_sblk_qseed3_1_2 (Abhinav)
Note: I've choosen _qseed3_ instead of the suggested _scaler_, as
there are other scaler types which might have their own versioning
scheme
- Dropped the DPU_SSPP_SCALER and DPU_SSPP_CSC_ANY defines (Abhinav)
Changes since v3:
- Proprely describe dpu_scaler_blk::version field as the register value
(Marijn)
- Picked up Marijn's prior art patches (sorry, missed them while
preparing v3) (Marijn)
Changes since v2:
- Reworked the VIG SBLK definitions to set the scaler version (Marijn,
Abhinav)
- Rebased the reset of the patches on top of this (intrusive) change.
- Folded QSEED3LITE and QSEED4 feature bits into QSEED3
Dmitry Baryshkov (8):
drm/msm/dpu: populate SSPP scaler block version
drm/msm/dpu: drop the `id' field 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: rewrite scaler and CSC presense checks
drm/msm/dpu: merge DPU_SSPP_SCALER_QSEED3, QSEED3LITE, QSEED4
drm/msm/gpu: drop duplicating VIG feature masks
Marijn Suijten (2):
drm/msm/dpu: Drop unused get_scaler_ver callback from SSPP
drm/msm/dpu: Drop unused qseed_type from catalog dpu_caps
.../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 17 +-
.../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 17 +-
.../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 17 +-
.../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 17 +-
.../msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 8 +-
.../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 25 ++-
.../msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 11 +-
.../msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 7 +-
.../msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 11 +-
.../msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 4 +-
.../msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 7 +-
.../msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 25 ++-
.../msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +-
.../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 25 ++-
.../msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 25 ++-
.../msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 29 ++--
.../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 149 +++++++-----------
.../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 57 +++----
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 20 +--
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 21 ---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 6 -
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 -
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 7 +-
23 files changed, 204 insertions(+), 313 deletions(-)
--
2.42.0
