Commit 9bed494c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-6.13' of... 

Merge tag 'mediatek-drm-next-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 6.13

1. Add support for OF graphs
2. Fix child node refcount handling and use scoped

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241104124103.8041-1-chunkuang.hu@kernel.org
parents 086ed1d5 fd620fc2

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml

+40 −0
Original line number Diff line number Diff line
@@ -62,6 +62,27 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle-array

    maxItems: 1



  ports:

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

    description:

      Input and output ports can have multiple endpoints, each of those

      connects to either the primary, secondary, etc, display pipeline.



    properties:

      port@0:

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

        description: AAL input port



      port@1:

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

        description:

          AAL output to the next component's input, for example could be one

          of many gamma, overdrive or other blocks.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg
@@ -89,5 +110,24 @@ examples: 
           power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

           clocks = <&mmsys CLK_MM_DISP_AAL>;

           mediatek,gce-client-reg = <&gce SUBSYS_1401XXXX 0x5000 0x1000>;



           ports {

               #address-cells = <1>;

               #size-cells = <0>;



               port@0 {

                   reg = <0>;

                   aal0_in: endpoint {

                       remote-endpoint = <&ccorr0_out>;

                   };

               };



               port@1 {

                   reg = <1>;

                   aal0_out: endpoint {

                       remote-endpoint = <&gamma0_in>;

                   };

               };

           };

       };

    };

Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml

+21 −0
Original line number Diff line number Diff line
@@ -57,6 +57,27 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle-array

    maxItems: 1



  ports:

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

    description:

      Input and output ports can have multiple endpoints, each of those

      connects to either the primary, secondary, etc, display pipeline.



    properties:

      port@0:

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

        description: CCORR input port



      port@1:

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

        description:

          CCORR output to the input of the next desired component in the

          display pipeline, usually only one of the available AAL blocks.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml

+22 −0
Original line number Diff line number Diff line
@@ -65,6 +65,28 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle-array

    maxItems: 1



  ports:

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

    description:

      Input and output ports can have multiple endpoints, each of those

      connects to either the primary, secondary, etc, display pipeline.



    properties:

      port@0:

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

        description: COLOR input port



      port@1:

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

        description:

          COLOR output to the input of the next desired component in the

          display pipeline, for example one of the available CCORR or AAL

          blocks.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml

+22 −0
Original line number Diff line number Diff line
@@ -56,6 +56,28 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle-array

    maxItems: 1



  ports:

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

    description:

      Input and output ports can have multiple endpoints, each of those

      connects to either the primary, secondary, etc, display pipeline.



    properties:

      port@0:

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

        description: DITHER input, usually from a POSTMASK or GAMMA block.



      port@1:

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

        description:

          DITHER output to the input of the next desired component in the

          display pipeline, for example one of the available DSC compressors,

          DP_INTF, DSI, LVDS or others.



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml

+23 −2
Original line number Diff line number Diff line
@@ -81,13 +81,34 @@ properties: 
      Output port node. This port should be connected to the input port of an

      attached HDMI, LVDS or DisplayPort encoder chip.



  ports:

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



    properties:

      port@0:

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

        description: DPI input port



      port@1:

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

        description: DPI output to an HDMI, LVDS or DisplayPort encoder input



    required:

      - port@0

      - port@1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



oneOf:

  - required:

      - port

  - required:

      - ports



additionalProperties: false
@@ -96,7 +117,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/mt8173-clk.h>



    dpi0: dpi@1401d000 {

    dpi: dpi@1401d000 {

        compatible = "mediatek,mt8173-dpi";

        reg = <0x1401d000 0x1000>;

        interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>;