Commit 95d8c671 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



msm-next for v6.1

DPU:
- simplified VBIF configuration
- cleaned up CTL interfaces to accept indices rather than flush masks

DSI:
- removed unused msm_display_dsc_config struct
- switch regulator calls to new bulk API
- switched to use PANEL_BRIDGE for directly attached panels

DSI PHY:
- converted drivers to use parent_hws instead of parent_names

DP:
- cleaned up pixel_rate handling

HDMI PHY:
- turned hdmi-phy-8996 into OF clk provider

core:
- misc dt-bindings fixes
- choose eDP as primary display if it's available
- support getting interconnects from either the mdss or the mdp5/dpu
  device nodes

gpu+gem:
- Shrinker + LRU re-work:
  - adds a shared GEM LRU+shrinker helper and moves msm over to that
  - reduces lock contention between retire and submit by avoiding the
    need to acquire obj lock in retire path (and instead using resv
    seeing obj's busyness in the shrinker
  - fix reclaim vs submit issues
- GEM fault injection for triggering userspace error paths
- Map/unmap optimization
- Improved robustness for a6xx GPU recovery

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGsrfrr9v1oR9S4oYfOs9jm=jbKQiwPBTrCRHrjYerJJFA@mail.gmail.com
parents d601cc93 e8b595f7

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

+41 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - qcom,sm8350-dp



  reg:

    minItems: 4

    items:

      - description: ahb register block

      - description: aux register block
@@ -70,14 +71,28 @@ properties: 
  operating-points-v2:

    maxItems: 1



  opp-table: true



  power-domains:

    maxItems: 1



  aux-bus:

    $ref: /schemas/display/dp-aux-bus.yaml#



  data-lanes:

    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 1

    maxItems: 4

    items:

      maximum: 3



  "#sound-dai-cells":

    const: 0



  vdda-0p9-supply: true

  vdda-1p2-supply: true

  vdda-0p9-supply:

    deprecated: true

  vdda-1p2-supply:

    deprecated: true



  ports:

    $ref: /schemas/graph.yaml#/properties/ports
@@ -98,10 +113,33 @@ required: 
  - clock-names

  - phys

  - phy-names

  - "#sound-dai-cells"

  - power-domains

  - ports



allOf:

  # AUX BUS does not exist on DP controllers

  # Audio output also is present only on DP output

  # p1 regions is present on DP, but not on eDP

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sc7280-edp

              - qcom,sc8180x-edp

    then:

      properties:

        "#sound-dai-cells": false

        reg:

          maxItems: 4

    else:

      properties:

        aux-bus: false

        reg:

          minItems: 5

      required:

        - "#sound-dai-cells"



additionalProperties: false



examples:
@@ -140,9 +178,6 @@ examples: 


        power-domains = <&rpmhpd SC7180_CX>;



        vdda-0p9-supply = <&vdda_usb_ss_dp_core>;

        vdda-1p2-supply = <&vdda_usb_ss_dp_1p2>;



        ports {

            #address-cells = <1>;

            #size-cells = <0>;

Documentation/devicetree/bindings/display/msm/dpu-msm8998.yaml

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ patternProperties: 
  "^display-controller@[0-9a-f]+$":

    type: object

    description: Node containing the properties of DPU.

    additionalProperties: false



    properties:

      compatible:
@@ -105,6 +106,9 @@ patternProperties: 
        maxItems: 1



      operating-points-v2: true

      opp-table:

        type: object



      ports:

        $ref: /schemas/graph.yaml#/properties/ports

        description: |

Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ patternProperties: 
  "^display-controller@[0-9a-f]+$":

    type: object

    description: Node containing the properties of DPU.

    additionalProperties: false



    properties:

      compatible:
@@ -113,6 +114,8 @@ patternProperties: 
        maxItems: 1



      operating-points-v2: true

      opp-table:

        type: object



      ports:

        $ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/display/msm/dpu-sc7180.yaml

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ patternProperties: 
  "^display-controller@[0-9a-f]+$":

    type: object

    description: Node containing the properties of DPU.

    additionalProperties: false



    properties:

      compatible:
@@ -114,6 +115,8 @@ patternProperties: 
        maxItems: 1



      operating-points-v2: true

      opp-table:

        type: object



      ports:

        $ref: /schemas/graph.yaml#/properties/ports

Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ patternProperties: 
  "^display-controller@[0-9a-f]+$":

    type: object

    description: Node containing the properties of DPU.

    additionalProperties: false



    properties:

      compatible:
@@ -112,6 +113,8 @@ patternProperties: 
        maxItems: 1



      operating-points-v2: true

      opp-table:

        type: object



      ports:

        $ref: /schemas/graph.yaml#/properties/ports