| Message ID | 20230911214521.787453-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | drm/msm/dpu: simplify DPU sub-blocks info | expand |
On 9/11/2023 2:45 PM, Dmitry Baryshkov wrote: > From: Marijn Suijten <marijn.suijten@somainline.org> > > This pointer callback is never used and should be removed. > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > [DB: dropped the helpers completely, which are unused now] > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 13 +------------ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 ------ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 6 ------ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 --- > 4 files changed, 1 insertion(+), 27 deletions(-) > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On 9/11/2023 2:45 PM, Dmitry Baryshkov wrote: > The field `id' is not used for subblocks. The handling code usually > knows, which sub-block it is now looking at. Drop the field completely. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 76 +++++++++---------- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 - > 2 files changed, 36 insertions(+), 42 deletions(-) > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On 9/11/2023 2:45 PM, Dmitry Baryshkov wrote: > In preparation to deduplicating SSPP subblocks, drop the (unused) > `smart_dma_priority' field from struct dpu_sspp_sub_blks. If it is > needed later (e.g. for SmartDMA v1), it should be added to the SSPP > declarations themselves. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 112 +++++++----------- > .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 - > 2 files changed, 40 insertions(+), 74 deletions(-) > Alright, if we need it later, we can add it to the SSPP itself Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
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 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 Changes since v1: - Dropped the patch dropping 'name' field (Abhinav). - Deduplicate equivalent SBLK definitions. - Dropped the dpu_csc_blk and dpu_dsc_blk merge. Dmitry Baryshkov (7): 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: 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 | 145 +++++++----------- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 55 +++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 20 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 10 +- 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 | 3 +- 23 files changed, 200 insertions(+), 296 deletions(-)