Commit 6d09e5cb authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

Mediatek DRM Next for Linux 5.18

1. Transfer display binding document to yaml format.
2. Add mt8195 display device binding.
3. Allow commands to be sent during video mode.
4. Add wait_for_event for crtc disable by cmdq.

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1645934583-2018-1-git-send-email-chunkuang.hu@kernel.org
parents 54f43c17 aa2d5f2f

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

0 → 100644
+77 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/mediatek/mediatek,aal.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek display adaptive ambient light processor



maintainers:

  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>



description: |

  Mediatek display adaptive ambient light processor, namely AAL,

  is responsible for backlight power saving and sunlight visibility improving.

  AAL device node must be siblings to the central MMSYS_CONFIG node.

  For a description of the MMSYS_CONFIG binding, see

  Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

  for details.



properties:

  compatible:

    oneOf:

      - items:

          - const: mediatek,mt8173-disp-aal

      - items:

          - enum:

              - mediatek,mt2712-disp-aal

              - mediatek,mt8183-disp-aal

              - mediatek,mt8192-disp-aal

              - mediatek,mt8195-disp-aal

          - enum:

              - mediatek,mt8173-disp-aal



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  power-domains:

    description: A phandle and PM domain specifier as defined by bindings of

      the power controller specified by phandle. See

      Documentation/devicetree/bindings/power/power-domain.yaml for details.



  clocks:

    items:

      - description: AAL Clock



  mediatek,gce-client-reg:

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property, such as phandle of gce, subsys id,

      register offset and size. Each GCE subsys id is mapping to a client

      defined in the header include/dt-bindings/gce/<chip>-gce.h.

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

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - power-domains

  - clocks



additionalProperties: false



examples:

  - |



    aal@14015000 {

        compatible = "mediatek,mt8173-disp-aal";

        reg = <0 0x14015000 0 0x1000>;

        interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_LOW>;

        power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

        clocks = <&mmsys CLK_MM_DISP_AAL>;

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

    };

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

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/mediatek/mediatek,ccorr.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek display color correction



maintainers:

  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>



description: |

  Mediatek display color correction, namely CCORR, reproduces correct color

  on panels with different color gamut.

  CCORR device node must be siblings to the central MMSYS_CONFIG node.

  For a description of the MMSYS_CONFIG binding, see

  Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

  for details.



properties:

  compatible:

    oneOf:

      - items:

          - const: mediatek,mt8183-disp-ccorr

      - items:

          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8195-disp-ccorr

          - enum:

              - mediatek,mt8192-disp-ccorr



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  power-domains:

    description: A phandle and PM domain specifier as defined by bindings of

      the power controller specified by phandle. See

      Documentation/devicetree/bindings/power/power-domain.yaml for details.



  clocks:

    items:

      - description: CCORR Clock



  mediatek,gce-client-reg:

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property, such as phandle of gce, subsys id,

      register offset and size. Each GCE subsys id is mapping to a client

      defined in the header include/dt-bindings/gce/<chip>-gce.h.

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

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - power-domains

  - clocks



additionalProperties: false



examples:

  - |



    ccorr0: ccorr@1400f000 {

        compatible = "mediatek,mt8183-disp-ccorr";

        reg = <0 0x1400f000 0 0x1000>;

        interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_LOW>;

        power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;

        clocks = <&mmsys CLK_MM_DISP_CCORR0>;

        mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0xf000 0x1000>;

    };

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

0 → 100644
+86 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/mediatek/mediatek,color.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek display color processor



maintainers:

  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>



description: |

  Mediatek display color processor, namely COLOR, provides hue, luma and

  saturation adjustments to get better picture quality and to have one panel

  resemble the other in their output characteristics.

  COLOR device node must be siblings to the central MMSYS_CONFIG node.

  For a description of the MMSYS_CONFIG binding, see

  Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

  for details.



properties:

  compatible:

    oneOf:

      - items:

          - const: mediatek,mt2701-disp-color

      - items:

          - const: mediatek,mt8167-disp-color

      - items:

          - const: mediatek,mt8173-disp-color

      - items:

          - enum:

              - mediatek,mt7623-disp-color

              - mediatek,mt2712-disp-color

          - enum:

              - mediatek,mt2701-disp-color

      - items:

          - enum:

              - mediatek,mt8183-disp-color

              - mediatek,mt8192-disp-color

              - mediatek,mt8195-disp-color

          - enum:

              - mediatek,mt8173-disp-color

  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  power-domains:

    description: A phandle and PM domain specifier as defined by bindings of

      the power controller specified by phandle. See

      Documentation/devicetree/bindings/power/power-domain.yaml for details.



  clocks:

    items:

      - description: COLOR Clock



  mediatek,gce-client-reg:

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property, such as phandle of gce, subsys id,

      register offset and size. Each GCE subsys id is mapping to a client

      defined in the header include/dt-bindings/gce/<chip>-gce.h.

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

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - power-domains

  - clocks



additionalProperties: false



examples:

  - |



    color0: color@14013000 {

        compatible = "mediatek,mt8173-disp-color";

        reg = <0 0x14013000 0 0x1000>;

        interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_LOW>;

        power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

        clocks = <&mmsys CLK_MM_DISP_COLOR0>;

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

    };

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

deleted100644 → 0
+0 −219
Original line number Diff line number Diff line 
Mediatek display subsystem

==========================



The Mediatek display subsystem consists of various DISP function blocks in the

MMSYS register space. The connections between them can be configured by output

and input selectors in the MMSYS_CONFIG register space. Pixel clock and start

of frame signal are distributed to the other function blocks by a DISP_MUTEX

function block.



All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.

For a description of the MMSYS_CONFIG binding, see

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.



DISP function blocks

====================



A display stream starts at a source function block that reads pixel data from

memory and ends with a sink function block that drives pixels on a display

interface, or writes pixels back to memory. All DISP function blocks have

their own register space, interrupt, and clock gate. The blocks that can

access memory additionally have to list the IOMMU and local arbiter they are

connected to.



For a description of the display interface sink function blocks, see

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt and

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



Required properties (all function blocks):

- compatible: "mediatek,<chip>-disp-<function>", one of

	"mediatek,<chip>-disp-ovl"   		- overlay (4 layers, blending, csc)

	"mediatek,<chip>-disp-ovl-2l"           - overlay (2 layers, blending, csc)

	"mediatek,<chip>-disp-rdma"  		- read DMA / line buffer

	"mediatek,<chip>-disp-wdma"  		- write DMA

	"mediatek,<chip>-disp-ccorr"            - color correction

	"mediatek,<chip>-disp-color" 		- color processor

	"mediatek,<chip>-disp-dither"           - dither

	"mediatek,<chip>-disp-aal"   		- adaptive ambient light controller

	"mediatek,<chip>-disp-gamma" 		- gamma correction

	"mediatek,<chip>-disp-merge" 		- merge streams from two RDMA sources

	"mediatek,<chip>-disp-postmask" 	- control round corner for display frame

	"mediatek,<chip>-disp-split" 		- split stream to two encoders

	"mediatek,<chip>-disp-ufoe"  		- data compression engine

	"mediatek,<chip>-dsi"        		- DSI controller, see mediatek,dsi.txt

	"mediatek,<chip>-dpi"        		- DPI controller, see mediatek,dpi.txt

	"mediatek,<chip>-disp-mutex" 		- display mutex

	"mediatek,<chip>-disp-od"    		- overdrive

  the supported chips are mt2701, mt7623, mt2712, mt8167, mt8173, mt8183 and mt8192.

- reg: Physical base address and length of the function block register space

- interrupts: The interrupt signal from the function block (required, except for

  merge and split function blocks).

- clocks: device clocks

  See Documentation/devicetree/bindings/clock/clock-bindings.txt for details.

  For most function blocks this is just a single clock input. Only the DSI and

  DPI controller nodes have multiple clock inputs. These are documented in

  mediatek,dsi.txt and mediatek,dpi.txt, respectively.

  An exception is that the mt8183 mutex is always free running with no clocks property.



Required properties (DMA function blocks):

- compatible: Should be one of

	"mediatek,<chip>-disp-ovl"

	"mediatek,<chip>-disp-rdma"

	"mediatek,<chip>-disp-wdma"

  the supported chips are mt2701, mt8167 and mt8173.

- larb: Should contain a phandle pointing to the local arbiter device as defined

  in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

- iommus: Should point to the respective IOMMU block with master port as

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

  for details.



Optional properties (RDMA function blocks):

- mediatek,rdma-fifo-size: rdma fifo size may be different even in same SOC, add this

  property to the corresponding rdma

  the value is the Max value which defined in hardware data sheet.

  mediatek,rdma-fifo-size of mt8173-rdma0 is 8K

  mediatek,rdma-fifo-size of mt8183-rdma0 is 5K

  mediatek,rdma-fifo-size of mt8183-rdma1 is 2K



Examples:



mmsys: clock-controller@14000000 {

	compatible = "mediatek,mt8173-mmsys", "syscon";

	reg = <0 0x14000000 0 0x1000>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	#clock-cells = <1>;

};



ovl0: ovl@1400c000 {

	compatible = "mediatek,mt8173-disp-ovl";

	reg = <0 0x1400c000 0 0x1000>;

	interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_OVL0>;

	iommus = <&iommu M4U_PORT_DISP_OVL0>;

	mediatek,larb = <&larb0>;

};



ovl1: ovl@1400d000 {

	compatible = "mediatek,mt8173-disp-ovl";

	reg = <0 0x1400d000 0 0x1000>;

	interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_OVL1>;

	iommus = <&iommu M4U_PORT_DISP_OVL1>;

	mediatek,larb = <&larb4>;

};



rdma0: rdma@1400e000 {

	compatible = "mediatek,mt8173-disp-rdma";

	reg = <0 0x1400e000 0 0x1000>;

	interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA0>;

	iommus = <&iommu M4U_PORT_DISP_RDMA0>;

	mediatek,larb = <&larb0>;

	mediatek,rdma-fifosize = <8192>;

};



rdma1: rdma@1400f000 {

	compatible = "mediatek,mt8173-disp-rdma";

	reg = <0 0x1400f000 0 0x1000>;

	interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA1>;

	iommus = <&iommu M4U_PORT_DISP_RDMA1>;

	mediatek,larb = <&larb4>;

};



rdma2: rdma@14010000 {

	compatible = "mediatek,mt8173-disp-rdma";

	reg = <0 0x14010000 0 0x1000>;

	interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_RDMA2>;

	iommus = <&iommu M4U_PORT_DISP_RDMA2>;

	mediatek,larb = <&larb4>;

};



wdma0: wdma@14011000 {

	compatible = "mediatek,mt8173-disp-wdma";

	reg = <0 0x14011000 0 0x1000>;

	interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_WDMA0>;

	iommus = <&iommu M4U_PORT_DISP_WDMA0>;

	mediatek,larb = <&larb0>;

};



wdma1: wdma@14012000 {

	compatible = "mediatek,mt8173-disp-wdma";

	reg = <0 0x14012000 0 0x1000>;

	interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_WDMA1>;

	iommus = <&iommu M4U_PORT_DISP_WDMA1>;

	mediatek,larb = <&larb4>;

};



color0: color@14013000 {

	compatible = "mediatek,mt8173-disp-color";

	reg = <0 0x14013000 0 0x1000>;

	interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_COLOR0>;

};



color1: color@14014000 {

	compatible = "mediatek,mt8173-disp-color";

	reg = <0 0x14014000 0 0x1000>;

	interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_COLOR1>;

};



aal@14015000 {

	compatible = "mediatek,mt8173-disp-aal";

	reg = <0 0x14015000 0 0x1000>;

	interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_AAL>;

};



gamma@14016000 {

	compatible = "mediatek,mt8173-disp-gamma";

	reg = <0 0x14016000 0 0x1000>;

	interrupts = <GIC_SPI 190 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_GAMMA>;

};



ufoe@1401a000 {

	compatible = "mediatek,mt8173-disp-ufoe";

	reg = <0 0x1401a000 0 0x1000>;

	interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_UFOE>;

};



dsi0: dsi@1401b000 {

	/* See mediatek,dsi.txt for details */

};



dpi0: dpi@1401d000 {

	/* See mediatek,dpi.txt for details */

};



mutex: mutex@14020000 {

	compatible = "mediatek,mt8173-disp-mutex";

	reg = <0 0x14020000 0 0x1000>;

	interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_MUTEX_32K>;

};



od@14023000 {

	compatible = "mediatek,mt8173-disp-od";

	reg = <0 0x14023000 0 0x1000>;

	power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

	clocks = <&mmsys CLK_MM_DISP_OD>;

};

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

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/mediatek/mediatek,dither.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek display dither processor



maintainers:

  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>



description: |

  Mediatek display dither processor, namely DITHER, works by approximating

  unavailable colors with available colors and by mixing and matching available

  colors to mimic unavailable ones.

  DITHER device node must be siblings to the central MMSYS_CONFIG node.

  For a description of the MMSYS_CONFIG binding, see

  Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

  for details.



properties:

  compatible:

    oneOf:

      - items:

          - const: mediatek,mt8183-disp-dither

      - items:

          - enum:

              - mediatek,mt8192-disp-dither

              - mediatek,mt8195-disp-dither

          - enum:

              - mediatek,mt8183-disp-dither



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  power-domains:

    description: A phandle and PM domain specifier as defined by bindings of

      the power controller specified by phandle. See

      Documentation/devicetree/bindings/power/power-domain.yaml for details.



  clocks:

    items:

      - description: DITHER Clock



  mediatek,gce-client-reg:

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property, such as phandle of gce, subsys id,

      register offset and size. Each GCE subsys id is mapping to a client

      defined in the header include/dt-bindings/gce/<chip>-gce.h.

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

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - power-domains

  - clocks



additionalProperties: false



examples:

  - |



    dither0: dither@14012000 {

        compatible = "mediatek,mt8183-disp-dither";

        reg = <0 0x14012000 0 0x1000>;

        interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_LOW>;

        power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;

        clocks = <&mmsys CLK_MM_DISP_DITHER0>;

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

    };