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

Merge tag 'drm-misc-next-2024-12-19' of... 

Merge tag 'drm-misc-next-2024-12-19' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for 6.14:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - connector: Add a mutex to protect ELD access, Add a helper to create
    a connector in two steps

Driver Changes:
  - amdxdna: Add RyzenAI-npu6 Support, various improvements
  - rcar-du: Add r8a779h0 Support
  - rockchip: various improvements
  - zynqmp: Add DP audio support
  - bridges:
    - ti-sn65dsi83: Add ti,lvds-vod-swing optional properties
  - panels:
    - new panels: Tianma TM070JDHG34-00, Multi-Inno Technology MI1010Z1T-1CP11

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241219-truthful-demonic-hound-598f63@houat
parents 8368e971 1e93f594

Documentation/devicetree/bindings/display/bridge/renesas,dsi-csi2-tx.yaml

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

      - renesas,r8a779a0-dsi-csi2-tx    # for V3U

      - renesas,r8a779g0-dsi-csi2-tx    # for V4H

      - renesas,r8a779h0-dsi-csi2-tx    # for V4M



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

+32 −2
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ properties: 
                  - const: 4



      port@2:

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

        description: Video port for LVDS Channel-A output (panel or bridge).

        $ref: '#/$defs/lvds-port'



      port@3:

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

        description: Video port for LVDS Channel-B output (panel or bridge).

        $ref: '#/$defs/lvds-port'



    required:

      - port@0
@@ -96,6 +96,36 @@ required: 
  - reg

  - ports



$defs:

  lvds-port:

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

    unevaluatedProperties: false



    properties:

      endpoint:

        $ref: /schemas/media/video-interfaces.yaml#

        unevaluatedProperties: false



        properties:

          ti,lvds-termination-ohms:

            description: The value of near end differential termination in ohms.

            enum: [100, 200]

            default: 200



          ti,lvds-vod-swing-clock-microvolt:

            description: LVDS diferential output voltage <min max> for clock

              lanes in microvolts.

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

            minItems: 2

            maxItems: 2



          ti,lvds-vod-swing-data-microvolt:

            description: LVDS diferential output voltage <min max> for data

              lanes in microvolts.

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

            minItems: 2

            maxItems: 2



allOf:

  - if:

      properties:

Documentation/devicetree/bindings/display/panel/panel-lvds.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ properties: 
          # Admatec 9904379 10.1" 1024x600 LVDS panel

          - admatec,9904379

          - auo,b101ew05

          # AUO G084SN05 V9 8.4" 800x600 LVDS panel

          - auo,g084sn05

          # Chunghwa Picture Tubes Ltd. 7" WXGA (800x1280) TFT LCD LVDS panel

          - chunghwa,claa070wp03xg

          # EDT ETML0700Z9NDHA 7.0" WSVGA (1024x600) color TFT LCD LVDS panel

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+6 −0
Original line number Diff line number Diff line
@@ -206,12 +206,16 @@ properties: 
      - mitsubishi,aa070mc01-ca1

        # Mitsubishi AA084XE01 8.4" XGA TFT LCD panel

      - mitsubishi,aa084xe01

        # Multi-Inno Technology Co.,Ltd MI0700A2T-30 7" 800x480 TFT Resistive Touch Module

      - multi-inno,mi0700a2t-30

        # Multi-Inno Technology Co.,Ltd MI0700S4T-6 7" 800x480 TFT Resistive Touch Module

      - multi-inno,mi0700s4t-6

        # Multi-Inno Technology Co.,Ltd MI0800FT-9 8" 800x600 TFT Resistive Touch Module

      - multi-inno,mi0800ft-9

        # Multi-Inno Technology Co.,Ltd MI1010AIT-1CP 10.1" 1280x800 LVDS IPS Cap Touch Mod.

      - multi-inno,mi1010ait-1cp

        # Multi-Inno Technology Co.,Ltd MI1010Z1T-1CP11 10.1" 1024x600 TFT Resistive Touch Module

      - multi-inno,mi1010z1t-1cp11

        # NEC LCD Technologies, Ltd. 12.1" WXGA (1280x800) LVDS TFT LCD panel

      - nec,nl12880bc20-05

        # NEC LCD Technologies,Ltd. WQVGA TFT LCD panel
@@ -280,6 +284,8 @@ properties: 
      - team-source-display,tst043015cmhx

        # Tianma Micro-electronics TM070JDHG30 7.0" WXGA TFT LCD panel

      - tianma,tm070jdhg30

        # Tianma Micro-electronics TM070JDHG34-00 7.0" WXGA (1280x800) LVDS TFT LCD panel

      - tianma,tm070jdhg34-00

        # Tianma Micro-electronics TM070JVHG33 7.0" WXGA TFT LCD panel

      - tianma,tm070jvhg33

        # Tianma Micro-electronics TM070RVHG71 7.0" WXGA TFT LCD panel

Documentation/devicetree/bindings/display/renesas,du.yaml

+62 −5
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ properties: 
      - renesas,du-r8a77995 # for R-Car D3 compatible DU

      - renesas,du-r8a779a0 # for R-Car V3U compatible DU

      - renesas,du-r8a779g0 # for R-Car V4H compatible DU

      - renesas,du-r8a779h0 # for R-Car V4M compatible DU



  reg:

    maxItems: 1
@@ -69,14 +70,12 @@ properties: 
        $ref: /schemas/graph.yaml#/properties/port

        unevaluatedProperties: false



    required:

      - port@0

      - port@1



    unevaluatedProperties: false



  renesas,cmms:

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

    minItems: 1

    maxItems: 4

    items:

      maxItems: 1

    description:
@@ -85,6 +84,8 @@ properties: 


  renesas,vsps:

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

    minItems: 1

    maxItems: 4

    items:

      items:

        - description: phandle to VSP instance that serves the DU channel
@@ -489,9 +490,11 @@ allOf: 


        renesas,cmms:

          minItems: 4

          maxItems: 4



        renesas,vsps:

          minItems: 4

          maxItems: 4



      required:

        - clock-names
@@ -558,9 +561,11 @@ allOf: 


        renesas,cmms:

          minItems: 3

          maxItems: 3



        renesas,vsps:

          minItems: 3

          maxItems: 3



      required:

        - clock-names
@@ -627,9 +632,11 @@ allOf: 


        renesas,cmms:

          minItems: 3

          maxItems: 3



        renesas,vsps:

          minItems: 3

          maxItems: 3



      required:

        - clock-names
@@ -683,7 +690,7 @@ allOf: 
            - port@1



        renesas,vsps:

          minItems: 1

          maxItems: 1



      required:

        - clock-names
@@ -746,9 +753,11 @@ allOf: 


        renesas,cmms:

          minItems: 2

          maxItems: 2



        renesas,vsps:

          minItems: 2

          maxItems: 2



      required:

        - clock-names
@@ -799,6 +808,54 @@ allOf: 


        renesas,vsps:

          minItems: 2

          maxItems: 2



      required:

        - clock-names

        - interrupts

        - resets

        - reset-names

        - renesas,vsps



  - if:

      properties:

        compatible:

          contains:

            enum:

              - renesas,du-r8a779h0

    then:

      properties:

        clocks:

          items:

            - description: Functional clock



        clock-names:

          items:

            - const: du.0



        interrupts:

          maxItems: 1



        resets:

          maxItems: 1



        reset-names:

          items:

            - const: du.0



        ports:

          properties:

            port@0:

              description: DSI 0

            port@1: false

            port@2: false

            port@3: false



          required:

            - port@0



        renesas,vsps:

          maxItems: 1



      required:

        - clock-names