| Message ID | 20230411-topic-straitlagoon_mdss-v5-0-998b4d2f7dd1@linaro.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | SM63(50|75) DPU support | expand |
On 23/05/2023 10:46, Konrad Dybcio wrote: [skipped the changelog] > --- > Konrad Dybcio (12): > dt-bindings: display/msm: dsi-controller-main: Add SM6350 > dt-bindings: display/msm: dsi-controller-main: Add SM6375 > dt-bindings: display/msm: sc7180-dpu: Describe SM6350 and SM6375 > dt-bindings: display/msm: Add SM6350 MDSS > dt-bindings: display/msm: Add SM6375 MDSS > drm/msm/dpu: Add SM6350 support > drm/msm: mdss: Add SM6350 support > drm/msm/dpu: Add SM6375 support > drm/msm: mdss: Add SM6375 support > iommu/arm-smmu-qcom: Sort the compatible list alphabetically > iommu/arm-smmu-qcom: Add SM6375 DPU compatible > iommu/arm-smmu-qcom: Add SM6350 DPU compatible As we are now nearly ready to merge this series, Will, Robin, what should be the merge strategy for these three patches? Would you take them through the arm-smmu/iommu tree? > > .../bindings/display/msm/dsi-controller-main.yaml | 4 + > .../bindings/display/msm/qcom,sc7180-dpu.yaml | 23 ++- > .../bindings/display/msm/qcom,sm6350-mdss.yaml | 214 ++++++++++++++++++++ > .../bindings/display/msm/qcom,sm6375-mdss.yaml | 216 +++++++++++++++++++++ > .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 173 +++++++++++++++++ > .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 139 +++++++++++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 + > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 + > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 + > drivers/gpu/drm/msm/msm_mdss.c | 10 + > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 +- > 11 files changed, 792 insertions(+), 3 deletions(-) > --- > base-commit: 9f925874281f7e8855855d6210d6e29d844e4307 > change-id: 20230411-topic-straitlagoon_mdss-8f34cacd5e26 > > Best regards,
On Thu, Jun 01, 2023 at 03:16:52AM +0300, Dmitry Baryshkov wrote: > On 23/05/2023 10:46, Konrad Dybcio wrote: > > [skipped the changelog] > > > --- > > Konrad Dybcio (12): > > dt-bindings: display/msm: dsi-controller-main: Add SM6350 > > dt-bindings: display/msm: dsi-controller-main: Add SM6375 > > dt-bindings: display/msm: sc7180-dpu: Describe SM6350 and SM6375 > > dt-bindings: display/msm: Add SM6350 MDSS > > dt-bindings: display/msm: Add SM6375 MDSS > > drm/msm/dpu: Add SM6350 support > > drm/msm: mdss: Add SM6350 support > > drm/msm/dpu: Add SM6375 support > > drm/msm: mdss: Add SM6375 support > > iommu/arm-smmu-qcom: Sort the compatible list alphabetically > > iommu/arm-smmu-qcom: Add SM6375 DPU compatible > > iommu/arm-smmu-qcom: Add SM6350 DPU compatible > > As we are now nearly ready to merge this series, Will, Robin, what should be > the merge strategy for these three patches? Would you take them through the > arm-smmu/iommu tree? I'm happy to take the three IOMMU changes, but the bulk of this series is replated to display and GPU so I don't think it makes sense for me to take those. Will
On Mon, 5 Jun 2023 at 18:43, Will Deacon <will@kernel.org> wrote: > > On Thu, Jun 01, 2023 at 03:16:52AM +0300, Dmitry Baryshkov wrote: > > On 23/05/2023 10:46, Konrad Dybcio wrote: > > > > [skipped the changelog] > > > > > --- > > > Konrad Dybcio (12): > > > dt-bindings: display/msm: dsi-controller-main: Add SM6350 > > > dt-bindings: display/msm: dsi-controller-main: Add SM6375 > > > dt-bindings: display/msm: sc7180-dpu: Describe SM6350 and SM6375 > > > dt-bindings: display/msm: Add SM6350 MDSS > > > dt-bindings: display/msm: Add SM6375 MDSS > > > drm/msm/dpu: Add SM6350 support > > > drm/msm: mdss: Add SM6350 support > > > drm/msm/dpu: Add SM6375 support > > > drm/msm: mdss: Add SM6375 support > > > iommu/arm-smmu-qcom: Sort the compatible list alphabetically > > > iommu/arm-smmu-qcom: Add SM6375 DPU compatible > > > iommu/arm-smmu-qcom: Add SM6350 DPU compatible > > > > As we are now nearly ready to merge this series, Will, Robin, what should be > > the merge strategy for these three patches? Would you take them through the > > arm-smmu/iommu tree? > > I'm happy to take the three IOMMU changes, but the bulk of this series is > replated to display and GPU so I don't think it makes sense for me to take > those. Could you please then ack merging them through the msm-next?
v4 -> v5: - Rebase on next-20230522 (drop regdma, drop external dependencies) - Reuse sdm845_vbif - Resize non-DSI INTFs to 0x280 (no TE block) - Fix up 6375 mdss bindings example - Rewrite reasoning of dropping the QoS LUT entry in "drm/msm/dpu: Add SM6350 support" - pick up tags - add DSC blocks for both SoCs No more dependency on INTFTE (merged) v4: https://lore.kernel.org/r/20230411-topic-straitlagoon_mdss-v4-0-68e7e25d70e1@linaro.org v3 -> v4: - Drop adding new QoS LUT entries - Add safe_lut_tbl for both SoCs Depends on: - https://lore.kernel.org/linux-arm-msm/20230411-dpu-intf-te-v4-0-27ce1a5ab5c6@somainline.org/ v3: https://lore.kernel.org/r/20230411-topic-straitlagoon_mdss-v3-0-9837d6b3516d@linaro.org v2 -> v3: - Don't duplicate qcm2290_lm_sblk - Use DEFAULT_DPU_LINE_WIDTH defines - Fix up sspp clk assignments for sm6350 - Add 6350-6375-common QoS data straight to the common file instead of moving it around after adding it - Fix up iommu compatible order before adding new entries - Reuse sm6350 msm_mdss_data for sm6375 - INTF_SC7180_MASK -> INTF_SC7280_MASK (enable HCTL) on 6375 - use double tabs in catalog headers - remove one unused entry in 6350 dpu_qos_lut_entry - add missing tear IRQs, drop INTF0 irq on 6375 - don't overduplicate DPU bindings, reuse 7180 - Pick up tags - Rebase on INTF_TE v4 and next-20230504 Depends on: - https://lore.kernel.org/linux-arm-msm/20230411-dpu-intf-te-v4-0-27ce1a5ab5c6@somainline.org/ v2: https://lore.kernel.org/r/20230411-topic-straitlagoon_mdss-v2-0-5def73f50980@linaro.org v1 -> v2: - Rebase on the DPU catalog rework and INTF_TE - Fix QSEED(3L/4) discrepancies - Fixed DMA/cursor discrepancies for 6350 - No deduplication, that's gonna be handled in catalogrework 2: "the return of the catalogrework" - Split MDSS & DPU binding additions - Drop "Allow variable SSPP/INTF_BLK size", that got in w/ the rework - Split MDSS and DPU additions - Pick up Rob's acks Depends on (and based on): https://lore.kernel.org/linux-arm-msm/20230411-dpu-intf-te-v2-0-ef76c877eb97@somainline.org/T/#t v1: https://lore.kernel.org/linux-arm-msm/20230211122656.1479141-1-konrad.dybcio@linaro.org/ Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- Konrad Dybcio (12): dt-bindings: display/msm: dsi-controller-main: Add SM6350 dt-bindings: display/msm: dsi-controller-main: Add SM6375 dt-bindings: display/msm: sc7180-dpu: Describe SM6350 and SM6375 dt-bindings: display/msm: Add SM6350 MDSS dt-bindings: display/msm: Add SM6375 MDSS drm/msm/dpu: Add SM6350 support drm/msm: mdss: Add SM6350 support drm/msm/dpu: Add SM6375 support drm/msm: mdss: Add SM6375 support iommu/arm-smmu-qcom: Sort the compatible list alphabetically iommu/arm-smmu-qcom: Add SM6375 DPU compatible iommu/arm-smmu-qcom: Add SM6350 DPU compatible .../bindings/display/msm/dsi-controller-main.yaml | 4 + .../bindings/display/msm/qcom,sc7180-dpu.yaml | 23 ++- .../bindings/display/msm/qcom,sm6350-mdss.yaml | 214 ++++++++++++++++++++ .../bindings/display/msm/qcom,sm6375-mdss.yaml | 216 +++++++++++++++++++++ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 173 +++++++++++++++++ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 139 +++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 + drivers/gpu/drm/msm/msm_mdss.c | 10 + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 +- 11 files changed, 792 insertions(+), 3 deletions(-) --- base-commit: 9f925874281f7e8855855d6210d6e29d844e4307 change-id: 20230411-topic-straitlagoon_mdss-8f34cacd5e26 Best regards,