Commit 3f5ba636 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2023-10-17' of https://gitlab.freedesktop.org/drm/msm into drm-next 

Updates for v6.7

DP:
- use existing helpers for DPCD handling instead of open-coded functions
- set the subconnector type according to the plugged cable / dongle
  skip validity check for DP CTS EDID checksum

DPU:
- continued migration of feature flags to use core revision checks
- reworked interrupts code to use '0' as NO_IRQ, removed raw IRQ indices
  from log / trace output

gpu:
- a7xx support (a730, a740)
- fixes and additional speedbins for a635, a643

core:
- decouple msm_drv from kms to more cleanly support headless devices (like
  imx5+a2xx)

From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvzkBL2_OgyOeP_b6rVEjrNdfm8jcKzaB04HqHyT5jYwA@mail.gmail.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 7cd62eab b08d26da

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

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


      port@1:

        $ref: /schemas/graph.yaml#/$defs/port-base

        unevaluatedProperties: false

        description: Output endpoint of the controller

        properties:

          endpoint:

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

+46 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ properties: 
  compatible:

    oneOf:

      - items:

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

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

          - const: qcom,adreno-gmu

      - const: qcom,adreno-gmu-wrapper
@@ -64,6 +64,10 @@ properties: 
  iommus:

    maxItems: 1



  qcom,qmp:

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

    description: Reference to the AOSS side-channel message RAM



  operating-points-v2: true



  opp-table:
@@ -213,6 +217,47 @@ allOf: 
            - const: axi

            - const: memnoc



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,adreno-gmu-730.1

              - qcom,adreno-gmu-740.1

    then:

      properties:

        reg:

          items:

            - description: Core GMU registers

            - description: Resource controller registers

            - description: GMU PDC registers

        reg-names:

          items:

            - const: gmu

            - const: rscc

            - const: gmu_pdc

        clocks:

          items:

            - description: GPU AHB clock

            - description: GMU clock

            - description: GPU CX clock

            - description: GPU AXI clock

            - description: GPU MEMNOC clock

            - description: GMU HUB clock

            - description: GPUSS DEMET clock

        clock-names:

          items:

            - const: ahb

            - const: gmu

            - const: cxo

            - const: axi

            - const: memnoc

            - const: hub

            - const: demet



      required:

        - qcom,qmp



  - if:

      properties:

        compatible:

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

+2 −2
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-6][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
@@ -203,7 +203,7 @@ allOf: 
        properties:

          compatible:

            contains:

              pattern: '^qcom,adreno-6[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,msm8998-mdss.yaml

+6 −0
Original line number Diff line number Diff line
@@ -38,12 +38,16 @@ properties: 
patternProperties:

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

    type: object

    additionalProperties: true



    properties:

      compatible:

        const: qcom,msm8998-dpu



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

    type: object

    additionalProperties: true



    properties:

      compatible:

        items:
@@ -52,6 +56,8 @@ patternProperties: 


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

    type: object

    additionalProperties: true



    properties:

      compatible:

        const: qcom,dsi-phy-10nm-8998

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

+6 −0
Original line number Diff line number Diff line
@@ -44,18 +44,24 @@ properties: 
patternProperties:

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

    type: object

    additionalProperties: true



    properties:

      compatible:

        const: qcom,qcm2290-dpu



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

    type: object

    additionalProperties: true



    properties:

      compatible:

        const: qcom,dsi-ctrl-6g-qcm2290



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

    type: object

    additionalProperties: true



    properties:

      compatible:

        const: qcom,dsi-phy-14nm-2290