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

Merge tag 'drm-msm-next-2024-02-29' of https://gitlab.freedesktop.org/drm/msm into drm-next 



Updates for v6.9:

Core:
- Correct bindings for MSM8976 and SM8650 platforms
- Start migration of MDP5 platforms to DPU driver
- X1E80100 MDSS support

DPU:
- Improve DSC allocation, fixing several important corner cases
- Add support for SDM630/SDM660 platforms
- Simplify dpu_encoder_phys_ops
- Apply fixes targeting DSC support with a single DSC encoder
- Apply fixes for HCTL_EN timing configuration
- X1E80100 support

DP:
- Refactor parser and power submodules

DSI:
- Clean up obsolete set_split_display support
- Update DSC documentation

MDP5:
- Clean up obsolete set_split_display support

GPU:
- fix sc7180 UBWC config
- fix a7xx LLC config
- new gpu support: a305B, a750, a702
- machine support: SM7150 (different power levels than other a618)
- a7xx devcoredump support

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtCq=CObbqKNOswWZdPw5dL8jq8BxD_hxP7kOCePUwNrg@mail.gmail.com
parents 017da39e 18397519

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
              - qcom,msm8916-dsi-ctrl

              - qcom,msm8953-dsi-ctrl

              - qcom,msm8974-dsi-ctrl

              - qcom,msm8976-dsi-ctrl

              - qcom,msm8996-dsi-ctrl

              - qcom,msm8998-dsi-ctrl

              - qcom,qcm2290-dsi-ctrl
@@ -248,6 +249,7 @@ allOf: 
          contains:

            enum:

              - qcom,msm8953-dsi-ctrl

              - qcom,msm8976-dsi-ctrl

    then:

      properties:

        clocks:

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

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ allOf: 
            enum:

              - qcom,adreno-gmu-730.1

              - qcom,adreno-gmu-740.1

              - qcom,adreno-gmu-750.1

    then:

      properties:

        reg:

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

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
          The driver is parsing the compat string for Adreno to

          figure out the gpu-id and patch level.

        items:

          - pattern: '^qcom,adreno-[3-7][0-9][0-9]\.[0-9]$'

          - pattern: '^qcom,adreno-[3-7][0-9][0-9]\.[0-9]+$'

          - const: qcom,adreno

      - description: |

          The driver is parsing the compat string for Imageon to
@@ -127,7 +127,7 @@ allOf: 
      properties:

        compatible:

          contains:

            pattern: '^qcom,adreno-[3-5][0-9][0-9]\.[0-9]$'

            pattern: '^qcom,adreno-[3-5][0-9][0-9]\.[0-9]+$'



    then:

      properties:
@@ -203,7 +203,7 @@ allOf: 
        properties:

          compatible:

            contains:

              pattern: '^qcom,adreno-[67][0-9][0-9]\.[0-9]$'

              pattern: '^qcom,adreno-[67][0-9][0-9]\.[0-9]+$'



      then: # Starting with A6xx, the clocks are usually defined in the GMU node

        properties:

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

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ patternProperties: 
          - qcom,dsi-phy-20nm

          - qcom,dsi-phy-28nm-8226

          - qcom,dsi-phy-28nm-hpm

          - qcom,dsi-phy-28nm-hpm-fam-b

          - qcom,dsi-phy-28nm-lp

          - qcom,hdmi-phy-8084

          - qcom,hdmi-phy-8660

Documentation/devicetree/bindings/display/msm/qcom,sm8650-dpu.yaml

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ $ref: /schemas/display/msm/dpu-common.yaml# 


properties:

  compatible:

    const: qcom,sm8650-dpu

    enum:

      - qcom,sm8650-dpu

      - qcom,x1e80100-dpu



  reg:

    items: