Commit 62a05f4a authored by Simona Vetter's avatar Simona Vetter
Browse files

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



Updates for v6.11

Core:
- SM7150 support

DPU:
- SM7150 support
- Fix DSC support for DSI panels in video mode
- Fixed TE vsync source support for DSI command-mode panels
- Fix for devices without UBWC in the display controller (ie.
  QCM2290)

DSI:
- Remove unused register-writing wrappers
- Fix DSC support for panels in video mode
- Add support for parsing TE vsync source
- Add support for MSM8937 (28nm DSI PHY)

MDP5:
- Add support for MSM8937
- Fix configuration for MSM8953

GPU:
- Split giant device table into per-gen "hw catalog" similar to
  what is done on the display side of the driver
- Fix a702 UBWC mode
- Fix unused variably warnings
- GPU memory traces
- Add param for userspace to know if raytracing is supported
- Memory barrier cleanup and GBIF unhalt fix
- X185 support (aka gpu in X1 laptop chips)
- a505 support
- fixes

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvZQpYEHpSCgXGJ2kaHJDK6QFAFfTsfiWm4b2zZOnjXGw@mail.gmail.com
parents d076e2bd fe34394e

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

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

              - qcom,sm6350-dsi-ctrl

              - qcom,sm6375-dsi-ctrl

              - qcom,sm7150-dsi-ctrl

              - qcom,sm8150-dsi-ctrl

              - qcom,sm8250-dsi-ctrl

              - qcom,sm8350-dsi-ctrl
@@ -162,6 +163,22 @@ properties: 
                items:

                  enum: [ 0, 1, 2, 3 ]



              qcom,te-source:

                $ref: /schemas/types.yaml#/definitions/string

                description:

                  Specifies the source of vsync signal from the panel used for

                  tearing elimination.

                default: mdp_vsync_p

                enum:

                  - mdp_vsync_p

                  - mdp_vsync_s

                  - mdp_vsync_e

                  - timer0

                  - timer1

                  - timer2

                  - timer3

                  - timer4



    required:

      - port@0

      - port@1
@@ -332,6 +349,7 @@ allOf: 
            enum:

              - qcom,sc7180-dsi-ctrl

              - qcom,sc7280-dsi-ctrl

              - qcom,sm7150-dsi-ctrl

              - qcom,sm8150-dsi-ctrl

              - qcom,sm8250-dsi-ctrl

              - qcom,sm8350-dsi-ctrl
@@ -452,6 +470,7 @@ examples: 
                          dsi0_out: endpoint {

                                   remote-endpoint = <&sn65dsi86_in>;

                                   data-lanes = <0 1 2 3>;

                                   qcom,te-source = "mdp_vsync_e";

                          };

                  };

           };

Documentation/devicetree/bindings/display/msm/dsi-phy-28nm.yaml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ properties: 
  compatible:

    enum:

      - qcom,dsi-phy-28nm-8226

      - qcom,dsi-phy-28nm-8937

      - qcom,dsi-phy-28nm-8960

      - qcom,dsi-phy-28nm-hpm

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

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

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ properties: 
      - items:

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

          - const: qcom,adreno-gmu

      - items:

          - pattern: '^qcom,adreno-gmu-x[1-9][0-9][0-9]\.[0-9]$'

          - const: qcom,adreno-gmu

      - const: qcom,adreno-gmu-wrapper



  reg:
@@ -225,6 +228,7 @@ allOf: 
              - qcom,adreno-gmu-730.1

              - qcom,adreno-gmu-740.1

              - qcom,adreno-gmu-750.1

              - qcom,adreno-gmu-x185.1

    then:

      properties:

        reg:

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

+23 −4
Original line number Diff line number Diff line
@@ -10,6 +10,18 @@ title: Adreno or Snapdragon GPUs 
maintainers:

  - Rob Clark <robdclark@gmail.com>



# dtschema does not select nodes based on pattern+const, so add custom select

# as a work-around:

select:

  properties:

    compatible:

      contains:

        enum:

          - qcom,adreno

          - amd,imageon

  required:

    - compatible



properties:

  compatible:

    oneOf:
@@ -17,7 +29,7 @@ properties: 
          The driver is parsing the compat string for Adreno to

          figure out the chip-id.

        items:

          - pattern: '^qcom,adreno-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]$'

          - pattern: '^qcom,adreno-[0-9a-f]{8}$'

          - const: qcom,adreno

      - description: |

          The driver is parsing the compat string for Adreno to
@@ -32,9 +44,13 @@ properties: 
          - pattern: '^amd,imageon-200\.[0-1]$'

          - const: amd,imageon



  clocks: true

  clocks:

    minItems: 2

    maxItems: 7



  clock-names: true

  clock-names:

    minItems: 2

    maxItems: 7



  reg:

    minItems: 1
@@ -42,7 +58,10 @@ properties: 


  reg-names:

    minItems: 1

    maxItems: 3

    items:

      - const: kgsl_3d0_reg_memory

      - const: cx_mem

      - const: cx_dbgc



  interrupts:

    maxItems: 1

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
              - qcom,msm8226-mdp5

              - qcom,msm8916-mdp5

              - qcom,msm8917-mdp5

              - qcom,msm8937-mdp5

              - qcom,msm8953-mdp5

              - qcom,msm8974-mdp5

              - qcom,msm8976-mdp5