Commit c8cd03eb authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2025-03-09' of https://gitlab.freedesktop.org/drm/msm into drm-next 



Updates for v6.15

GPU:
- Fix obscure GMU suspend failure
- Expose syncobj timeline support
- Extend GPU devcoredump with pagetable info
- a623 support
- Fix a6xx gen1/gen2 indexed-register blocks in gpu snapshot / devcoredump

Display:
- Add cpu-cfg interconnect paths on SM8560 and SM8650
- Introduce KMS OMMU fault handler, causing devcoredump snapshot
- Fixed error pointer dereference in msm_kms_init_aspace()

DPU:
- Fix mode_changing handling
- Add writeback support on SM6150 (QCS615)
- Fix DSC programming in 1:1:1 topology
- Reworked hardware resource allocation, moving it to the CRTC code
- Enabled support for Concurrent WriteBack (CWB) on SM8650
- Enabled CDM blocks on all relevant platforms
- Reworked debugfs interface for BW/clocks debugging
- Clear perf params before calculating bw
- Support YUV formats on writeback
- Fixed double inclusion
- Fixed writeback in YUV formats when using cloned output, Dropped
  wb2_formats_rgb
- Corrected dpu_crtc_check_mode_changed and struct dpu_encoder_virt
  kerneldocs
- Fixed uninitialized variable in dpu_crtc_kickoff_clone_mode()

DSI:
- DSC-related fixes
- Rework clock programming

DSI PHY:
- Fix 7nm (and lower) PHY programming
- Add proper DT schema definitions for DSI PHY clocks

HDMI:
- Rework the driver, enabling the use of the HDMI Connector framework

Bindings:
- Added eDP PHY on SA8775P

Misc:
- mailmap/MAINTAINERS: update Dmitry's email addr

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGu-rbEFzQQ-me6qRLgBOJ=Xro1PL=PhtKJ-K9=bCaiK0w@mail.gmail.com
parents 236f475d 83ee6d2e

.mailmap

+5 −4
Original line number Diff line number Diff line
@@ -200,10 +200,11 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>

Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>

Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <lumag@kernel.org> <dmitry_eremin@mentor.com>

Dmitry Baryshkov <lumag@kernel.org> <dmitry.baryshkov@linaro.org>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

+11 −59
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 7

          maxItems: 7

        clock-names:

          items:
@@ -248,29 +249,12 @@ allOf: 
          contains:

            enum:

              - qcom,msm8916-dsi-ctrl

    then:

      properties:

        clocks:

          maxItems: 6

        clock-names:

          items:

            - const: mdp_core

            - const: iface

            - const: bus

            - const: byte

            - const: pixel

            - const: core



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8953-dsi-ctrl

              - qcom,msm8976-dsi-ctrl

    then:

      properties:

        clocks:

          minItems: 6

          maxItems: 6

        clock-names:

          items:
@@ -291,6 +275,7 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 7

          maxItems: 7

        clock-names:

          items:
@@ -311,6 +296,7 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 7

          maxItems: 7

        clock-names:

          items:
@@ -328,28 +314,13 @@ allOf: 
          contains:

            enum:

              - qcom,msm8998-dsi-ctrl

              - qcom,sm6125-dsi-ctrl

              - qcom,sm6350-dsi-ctrl

    then:

      properties:

        clocks:

          maxItems: 6

        clock-names:

          items:

            - const: byte

            - const: byte_intf

            - const: pixel

            - const: core

            - const: iface

            - const: bus



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc7180-dsi-ctrl

              - qcom,sc7280-dsi-ctrl

              - qcom,sdm845-dsi-ctrl

              - qcom,sm6115-dsi-ctrl

              - qcom,sm6125-dsi-ctrl

              - qcom,sm6350-dsi-ctrl

              - qcom,sm6375-dsi-ctrl

              - qcom,sm6150-dsi-ctrl

              - qcom,sm7150-dsi-ctrl

              - qcom,sm8150-dsi-ctrl
@@ -361,6 +332,7 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 6

          maxItems: 6

        clock-names:

          items:
@@ -380,6 +352,7 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 9

          maxItems: 9

        clock-names:

          items:
@@ -393,27 +366,6 @@ allOf: 
            - const: pixel

            - const: core



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sdm845-dsi-ctrl

              - qcom,sm6115-dsi-ctrl

              - qcom,sm6375-dsi-ctrl

    then:

      properties:

        clocks:

          maxItems: 6

        clock-names:

          items:

            - const: byte

            - const: byte_intf

            - const: pixel

            - const: core

            - const: iface

            - const: bus



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/display/msm/dsi-phy-common.yaml

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ description: 
properties:

  "#clock-cells":

    const: 1

    description:

      See include/dt-bindings/clock/qcom,dsi-phy-28nm.h for clock IDs.



  "#phy-cells":

    const: 0

Documentation/devicetree/bindings/display/msm/gmu.yaml

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,adreno-gmu-623.0

              - qcom,adreno-gmu-635.0

              - qcom,adreno-gmu-660.1

              - qcom,adreno-gmu-663.0

Documentation/devicetree/bindings/display/msm/qcom,sa8775p-mdss.yaml

+30 −2
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ patternProperties: 
        items:

          - const: qcom,sa8775p-dp



  "^phy@[0-9a-f]+$":

    type: object

    additionalProperties: true

    properties:

      compatible:

        const: qcom,sa8775p-edp-phy



required:

  - compatible
@@ -61,6 +68,7 @@ examples: 
  - |

    #include <dt-bindings/interconnect/qcom,icc.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/qcom,sa8775p-dispcc.h>

    #include <dt-bindings/clock/qcom,sa8775p-gcc.h>

    #include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>

    #include <dt-bindings/power/qcom,rpmhpd.h>
@@ -158,6 +166,26 @@ examples: 
            };

        };



        mdss0_dp0_phy: phy@aec2a00 {

            compatible = "qcom,sa8775p-edp-phy";



            reg = <0x0aec2a00 0x200>,

                  <0x0aec2200 0xd0>,

                  <0x0aec2600 0xd0>,

                  <0x0aec2000 0x1c8>;



            clocks = <&dispcc0 MDSS_DISP_CC_MDSS_DPTX0_AUX_CLK>,

                     <&dispcc0 MDSS_DISP_CC_MDSS_AHB_CLK>;

            clock-names = "aux",

                          "cfg_ahb";



            #clock-cells = <1>;

            #phy-cells = <0>;



            vdda-phy-supply = <&vreg_l1c>;

            vdda-pll-supply = <&vreg_l4a>;

        };



        displayport-controller@af54000 {

            compatible = "qcom,sa8775p-dp";
@@ -186,9 +214,9 @@ examples: 


            assigned-clocks = <&dispcc_mdss_dptx0_link_clk_src>,

                              <&dispcc_mdss_dptx0_pixel0_clk_src>;

            assigned-clock-parents = <&mdss0_edp_phy 0>, <&mdss0_edp_phy 1>;

            assigned-clock-parents = <&mdss0_dp0_phy 0>, <&mdss0_dp0_phy 1>;



            phys = <&mdss0_edp_phy>;

            phys = <&mdss0_dp0_phy>;

            phy-names = "dp";



            operating-points-v2 = <&dp_opp_table>;