Commit 4f88cfd4 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

Mediatek DRM Next for Linux 6.8

1. Use devm_platform_ioremap_resource()
2. Stop using iommu_present()
3. Add display driver for MT8188 VDOSYS1
4. Add phy_mtk_dp module as pre-dependency

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231218145826.5643-1-chunkuang.hu@kernel.org
parents 22a2dece c8048dd0

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

+5 −1
Original line number Diff line number Diff line
@@ -23,7 +23,11 @@ description: 


properties:

  compatible:

    const: mediatek,mt8195-disp-ethdr

    oneOf:

      - const: mediatek,mt8195-disp-ethdr

      - items:

          - const: mediatek,mt8188-disp-ethdr

          - const: mediatek,mt8195-disp-ethdr



  reg:

    maxItems: 7

Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml

+5 −1
Original line number Diff line number Diff line
@@ -21,7 +21,11 @@ description: 


properties:

  compatible:

    const: mediatek,mt8195-vdo1-rdma

    oneOf:

      - const: mediatek,mt8195-vdo1-rdma

      - items:

          - const: mediatek,mt8188-vdo1-rdma

          - const: mediatek,mt8195-vdo1-rdma



  reg:

    maxItems: 1

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

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ properties: 
      - items:

          - const: mediatek,mt6795-disp-merge

          - const: mediatek,mt8173-disp-merge

      - items:

          - const: mediatek,mt8188-disp-merge

          - const: mediatek,mt8195-disp-merge



  reg:

    maxItems: 1

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

0 → 100644
+81 −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,padding.yaml#

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



title: MediaTek Display Padding



maintainers:

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

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



description:

  Padding provides ability to add pixels to width and height of a layer with

  specified colors. Due to hardware design, Mixer in VDOSYS1 requires

  width of a layer to be 2-pixel-align, or 4-pixel-align when ETHDR is enabled,

  we need Padding to deal with odd width.

  Please notice that even if the Padding is in bypass mode, settings in

  register must be cleared to 0, or undefined behaviors could happen.



properties:

  compatible:

    const: mediatek,mt8188-disp-padding



  reg:

    maxItems: 1



  power-domains:

    maxItems: 1



  clocks:

    items:

      - description: Padding's clocks



  mediatek,gce-client-reg:

    description:

      GCE (Global Command Engine) is a multi-core micro processor that helps

      its clients to execute commands without interrupting CPU. This property

      describes GCE client's information that is composed by 4 fields.

      1. Phandle of the GCE (there may be several GCE processors)

      2. Sub-system ID defined in the dt-binding like a user ID

         (Please refer to include/dt-bindings/gce/<chip>-gce.h)

      3. Offset from base address of the subsys you are at

      4. Size of the register the client needs

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

    items:

      items:

        - description: Phandle of the GCE

        - description: Subsys ID defined in the dt-binding

        - description: Offset from base address of the subsys

        - description: Size of register

    maxItems: 1



required:

  - compatible

  - reg

  - power-domains

  - clocks

  - mediatek,gce-client-reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/mediatek,mt8188-clk.h>

    #include <dt-bindings/power/mediatek,mt8188-power.h>

    #include <dt-bindings/gce/mt8195-gce.h>



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        padding0: padding@1c11d000 {

            compatible = "mediatek,mt8188-disp-padding";

            reg = <0 0x1c11d000 0 0x1000>;

            clocks = <&vdosys1 CLK_VDO1_PADDING0>;

            power-domains = <&spm MT8188_POWER_DOMAIN_VDOSYS1>;

            mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0xd000 0x1000>;

        };

    };

drivers/gpu/drm/mediatek/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ mediatek-drm-y := mtk_disp_aal.o \ 
		  mtk_dsi.o \

		  mtk_dpi.o \

		  mtk_ethdr.o \

		  mtk_mdp_rdma.o

		  mtk_mdp_rdma.o \

		  mtk_padding.o



obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o