Skip to contentSkip to conversation

add display support for MediaTek SoC MT8186

PATCH Applied Rex-BC Chen 3 participants 10 messages Mar 1, 2022 – Mar 3, 2022

Subsystems (6)

v5 of 11 Applied Latest is v11 →

lore
Share & tools
lore
#0 lore raw

v5 cover add display support for MediaTek SoC MT8186

v5:
1. Add binding patch of aal for MT8183.
2. Revise enum to const.
3. Change to use enum for mutex.
4. Remove patches which are accepted by maintainers. (mmsys and mutex)

v4:
1. Remove binding of dsi and dpi.
2. Revise aal binding.
3. Fix indention in [4/5].

v3:
1. Modify display binding based on mtk display binding patch. ([1])
2. Remove patch: drm/mediatek: separate postmask component from mtk_disp_drv.c
3. Remove compatible of 8186 ovl because we can re-use compatible of 8192 for 8186.
4. Fix issue of space before tab on mutex patch.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/commit/?h=mediatek-drm-next&id=4ed545e7d10049b5492afc184e61a67e478a2cfd

v2:
1. Add binding documentation for mmsys, mutex and mtk_display.
2. Remove duplicated definition of postmask registers on mtk_drm_drv.
3. Add disp_ovl support for MT8186.
4. Add detailed commit messages.

Rex-BC Chen (5):
dt-bindings: arm: mediatek: mmsys: add support for MT8186
dt-bindings: display: mediatek: add aal binding for MT8183
dt-bindings: display: mediatek: revise enum to const
dt-bindings: display: mediatek: change to use enum for mutex
dt-bindings: display: mediatek: add MT8186 SoC binding

Yongqiang Niu (1):
drm/mediatek: add display support for MT8186

 .../bindings/arm/mediatek/mediatek,mmsys.yaml |  1 +
 .../display/mediatek/mediatek,aal.yaml        |  9 ++++-
 .../display/mediatek/mediatek,ccorr.yaml      |  7 +++-
 .../display/mediatek/mediatek,color.yaml      |  5 +--
 .../display/mediatek/mediatek,dither.yaml     |  3 +-
 .../display/mediatek/mediatek,gamma.yaml      |  3 +-
 .../display/mediatek/mediatek,mutex.yaml      | 25 ++++++--------
 .../display/mediatek/mediatek,ovl-2l.yaml     |  5 +++
 .../display/mediatek/mediatek,ovl.yaml        |  9 +++--
 .../display/mediatek/mediatek,postmask.yaml   |  5 +++
 .../display/mediatek/mediatek,rdma.yaml       |  5 +--
 drivers/gpu/drm/mediatek/mtk_drm_drv.c        | 33 +++++++++++++++++++
 12 files changed, 85 insertions(+), 25 deletions(-)
Signature · 1 line
2.18.0
#1 lore raw

PATCH v5 1/6 dt-bindings: arm: mediatek: mmsys: add support for MT8186

Add "mediatek,mt8186-mmsys" to binding document.

---
 .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml         | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +1 -0
index 763c62323a74..b31d90dc9eb4 100644
@@ -29,6 +29,7 @@ properties:
               - mediatek,mt8167-mmsys
               - mediatek,mt8173-mmsys
               - mediatek,mt8183-mmsys
+              - mediatek,mt8186-mmsys
               - mediatek,mt8192-mmsys
               - mediatek,mt8365-mmsys
           - const: syscon
Signature · 1 line
2.18.0
maintainer Applied
#2 lore raw

Re: [PATCH V5 1/6] dt-bindings: arm: mediatek: mmsys: add support for MT8186

Quoted 4 lines · Rex-BC Chen

Add "mediatek,mt8186-mmsys" to binding document.

Applied, thanks!

Quoted 16 lines
---
  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml         | 1 +
  1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +1 -0
index 763c62323a74..b31d90dc9eb4 100644
@@ -29,6 +29,7 @@ properties:
                - mediatek,mt8167-mmsys
                - mediatek,mt8173-mmsys
                - mediatek,mt8183-mmsys
+              - mediatek,mt8186-mmsys
                - mediatek,mt8192-mmsys
                - mediatek,mt8365-mmsys
            - const: syscon
#3 lore raw

PATCH v5 2/6 dt-bindings: display: mediatek: add aal binding for MT8183

In reply to Rex-BC Chen

Add aal binding for MT8183.

---
 .../devicetree/bindings/display/mediatek/mediatek,aal.yaml      | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +2 -0
index 225f9dd726d2..191b56e16bee 100644
@@ -23,6 +23,8 @@ properties:
     oneOf:
       - items:
           - const: mediatek,mt8173-disp-aal
+      - items:
+          - const: mediatek,mt8183-disp-aal
       - items:
           - enum:
               - mediatek,mt2712-disp-aal
Signature · 1 line
2.18.0
#4 lore raw

PATCH v5 3/6 dt-bindings: display: mediatek: revise enum to const

In reply to Rex-BC Chen

There won't be more than 1 fallback for these bindings, so we modify them to use const instead of enum.

---
 .../devicetree/bindings/display/mediatek/mediatek,aal.yaml    | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml  | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,color.yaml  | 4 ++--
 .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml  | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml    | 4 ++--
 .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +1 -1
index 191b56e16bee..bc1c70d089ba 100644
@@ -31,7 +31,7 @@ properties:
               - mediatek,mt8183-disp-aal
               - mediatek,mt8192-disp-aal
               - mediatek,mt8195-disp-aal
-          - enum:
+          - const:
               - mediatek,mt8173-disp-aal
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -1
index 6894b6999412..fc40e2981eaa 100644
@@ -28,7 +28,7 @@ properties:
       - items:
           - enum:
               - mediatek,mt8195-disp-ccorr
-          - enum:
+          - const:
               - mediatek,mt8192-disp-ccorr
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +2 -2
index bc83155b3b4c..22ed5d368cbe 100644
@@ -32,14 +32,14 @@ properties:
           - enum:
               - mediatek,mt7623-disp-color
               - mediatek,mt2712-disp-color
-          - enum:
+          - const:
               - mediatek,mt2701-disp-color
       - items:
           - enum:
               - mediatek,mt8183-disp-color
               - mediatek,mt8192-disp-color
               - mediatek,mt8195-disp-color
-          - enum:
+          - const:
               - mediatek,mt8173-disp-color
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -1
index 9d89297f5f1d..2a82792b2625 100644
@@ -28,7 +28,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-dither
               - mediatek,mt8195-disp-dither
-          - enum:
+          - const:
               - mediatek,mt8183-disp-dither
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -1
index 247baad147b3..45f88bdf07bb 100644
@@ -29,7 +29,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-gamma
               - mediatek,mt8195-disp-gamma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-gamma
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +2 -2
index e71f79bc2dee..88ba3f27b0e4 100644
@@ -33,12 +33,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-ovl
               - mediatek,mt2712-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt2701-disp-ovl
       - items:
           - enum:
               - mediatek,mt8195-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt8183-disp-ovl
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +2 -2
index 8ef821641672..56368c10d904 100644
@@ -35,12 +35,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-rdma
               - mediatek,mt2712-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt2701-disp-rdma
       - items:
           - enum:
               - mediatek,mt8192-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-rdma
 
   reg:
Signature · 1 line
2.18.0
maintainer
#5 lore raw

Re: [PATCH V5 3/6] dt-bindings: display: mediatek: revise enum to const

Quoted 19 lines · Rex-BC Chen

There won't be more than 1 fallback for these bindings, so we modify them to use const instead of enum.

---
 .../devicetree/bindings/display/mediatek/mediatek,aal.yaml    | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml  | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,color.yaml  | 4 ++--
 .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml  | 2 +-
 .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml    | 4 ++--
 .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml   | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +0 -0
index 191b56e16bee..bc1c70d089ba 100644

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 35

Quoted 6 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +1 -1
@@ -31,7 +31,7 @@ properties:
               - mediatek,mt8183-disp-aal
               - mediatek,mt8192-disp-aal
               - mediatek,mt8195-disp-aal
-          - enum:
+          - const:
               - mediatek,mt8173-disp-aal

Run 'make dt_binding_check'. This will fail.

Quoted 108 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +0 -0
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -1
index 6894b6999412..fc40e2981eaa 100644
@@ -28,7 +28,7 @@ properties:
       - items:
           - enum:
               - mediatek,mt8195-disp-ccorr
-          - enum:
+          - const:
               - mediatek,mt8192-disp-ccorr
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +2 -2
index bc83155b3b4c..22ed5d368cbe 100644
@@ -32,14 +32,14 @@ properties:
           - enum:
               - mediatek,mt7623-disp-color
               - mediatek,mt2712-disp-color
-          - enum:
+          - const:
               - mediatek,mt2701-disp-color
       - items:
           - enum:
               - mediatek,mt8183-disp-color
               - mediatek,mt8192-disp-color
               - mediatek,mt8195-disp-color
-          - enum:
+          - const:
               - mediatek,mt8173-disp-color
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -1
index 9d89297f5f1d..2a82792b2625 100644
@@ -28,7 +28,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-dither
               - mediatek,mt8195-disp-dither
-          - enum:
+          - const:
               - mediatek,mt8183-disp-dither
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -1
index 247baad147b3..45f88bdf07bb 100644
@@ -29,7 +29,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-gamma
               - mediatek,mt8195-disp-gamma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-gamma
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +2 -2
index e71f79bc2dee..88ba3f27b0e4 100644
@@ -33,12 +33,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-ovl
               - mediatek,mt2712-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt2701-disp-ovl
       - items:
           - enum:
               - mediatek,mt8195-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt8183-disp-ovl
 
   reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +2 -2
index 8ef821641672..56368c10d904 100644
@@ -35,12 +35,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-rdma
               - mediatek,mt2712-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt2701-disp-rdma
       - items:
           - enum:
               - mediatek,mt8192-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-rdma
 
   reg:
Signature · 7 lines
2.18.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#6 lore raw

Re: [PATCH V5 3/6] dt-bindings: display: mediatek: revise enum to const

Hello Rob,

Thanks for your review.
I have sent v6 to fix this error.

https://lore.kernel.org/all/[email protected]/

BRs,
Rex

Quoted 197 lines · Rob Herring
Quoted 35 lines · Rex-BC Chen

There won't be more than 1 fallback for these bindings, so we modify
them to use const instead of enum.

---
 .../devicetree/bindings/display/mediatek/mediatek,aal.yaml    | 2
+-
 .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml  | 2
+-
 .../devicetree/bindings/display/mediatek/mediatek,color.yaml  | 4
++--
 .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 2
+-
 .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml  | 2
+-
 .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml    | 4
++--
 .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml   | 4
++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
index 191b56e16bee..bc1c70d089ba 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 35

Quoted 6 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +1 -1
@@ -31,7 +31,7 @@ properties:
               - mediatek,mt8183-disp-aal
               - mediatek,mt8192-disp-aal
               - mediatek,mt8195-disp-aal
-          - enum:
+          - const:
               - mediatek,mt8173-disp-aal

Run 'make dt_binding_check'. This will fail.

Quoted 152 lines
(quoted diff) +0 -0
   reg:

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml
index 6894b6999412..fc40e2981eaa 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml

Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -1
@@ -28,7 +28,7 @@ properties:
       - items:
           - enum:
               - mediatek,mt8195-disp-ccorr
-          - enum:
+          - const:
               - mediatek,mt8192-disp-ccorr
 
   reg:

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml
index bc83155b3b4c..22ed5d368cbe 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml

Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +2 -2
@@ -32,14 +32,14 @@ properties:
           - enum:
               - mediatek,mt7623-disp-color
               - mediatek,mt2712-disp-color
-          - enum:
+          - const:
               - mediatek,mt2701-disp-color
       - items:
           - enum:
               - mediatek,mt8183-disp-color
               - mediatek,mt8192-disp-color
               - mediatek,mt8195-disp-color
-          - enum:
+          - const:
               - mediatek,mt8173-disp-color
   reg:
     maxItems: 1

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dithe r.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dithe r.yaml
index 9d89297f5f1d..2a82792b2625 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dithe r.yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,dithe r.yaml

Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -1
@@ -28,7 +28,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-dither
               - mediatek,mt8195-disp-dither
-          - enum:
+          - const:
               - mediatek,mt8183-disp-dither
 
   reg:

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml
index 247baad147b3..45f88bdf07bb 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml

Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -1
@@ -29,7 +29,7 @@ properties:
           - enum:
               - mediatek,mt8192-disp-gamma
               - mediatek,mt8195-disp-gamma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-gamma
 
   reg:

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml
index e71f79bc2dee..88ba3f27b0e4 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml

Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +2 -2
@@ -33,12 +33,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-ovl
               - mediatek,mt2712-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt2701-disp-ovl
       - items:
           - enum:
               - mediatek,mt8195-disp-ovl
-          - enum:
+          - const:
               - mediatek,mt8183-disp-ovl
 
   reg:

diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml
index 8ef821641672..56368c10d904 100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml

Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +2 -2
@@ -35,12 +35,12 @@ properties:
           - enum:
               - mediatek,mt7623-disp-rdma
               - mediatek,mt2712-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt2701-disp-rdma
       - items:
           - enum:
               - mediatek,mt8192-disp-rdma
-          - enum:
+          - const:
               - mediatek,mt8183-disp-rdma
 
   reg:
Signature · 1 line
2.18.0
Quoted 4 lines
Quoted 4 lines

_______________________________________________
linux-arm-kernel mailing list
[email protected]

https://urldefense.com/v3/__http://lists.infradead.org/mailman/listinfo/linux-arm-kernel__;!!CTRNKA9wMg0ARbw!xcy2G7LgKWqMWhM9wMaommKbXGVMY6gc6B0zZRk4uP8AWS0KwLAg2O5buJuUVkOXiMa-$

Quoted 1 line
Quoted 1 line

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#7 lore raw

PATCH v5 4/6 dt-bindings: display: mediatek: change to use enum for mutex

In reply to Rex-BC Chen

All single entry cases in mutex can be merged as a single enum.

---
 .../display/mediatek/mediatek,mutex.yaml      | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +9 -15
index 6eca525eced0..0378933201b4 100644
@@ -23,21 +23,15 @@ description: |
 
 properties:
   compatible:
-    oneOf:
-      - items:
-          - const: mediatek,mt2701-disp-mutex
-      - items:
-          - const: mediatek,mt2712-disp-mutex
-      - items:
-          - const: mediatek,mt8167-disp-mutex
-      - items:
-          - const: mediatek,mt8173-disp-mutex
-      - items:
-          - const: mediatek,mt8183-disp-mutex
-      - items:
-          - const: mediatek,mt8192-disp-mutex
-      - items:
-          - const: mediatek,mt8195-disp-mutex
+    enum:
+      - mediatek,mt2701-disp-mutex
+      - mediatek,mt2712-disp-mutex
+      - mediatek,mt8167-disp-mutex
+      - mediatek,mt8173-disp-mutex
+      - mediatek,mt8183-disp-mutex
+      - mediatek,mt8192-disp-mutex
+      - mediatek,mt8195-disp-mutex
+
   reg:
     maxItems: 1
 
Signature · 1 line
2.18.0
#8 lore raw

PATCH v5 5/6 dt-bindings: display: mediatek: add MT8186 SoC binding

In reply to Rex-BC Chen

Add MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.

---
 .../devicetree/bindings/display/mediatek/mediatek,aal.yaml   | 5 +++++
 .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 5 +++++
 .../devicetree/bindings/display/mediatek/mediatek,color.yaml | 1 +
 .../bindings/display/mediatek/mediatek,dither.yaml           | 1 +
 .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml | 1 +
 .../devicetree/bindings/display/mediatek/mediatek,mutex.yaml | 1 +
 .../bindings/display/mediatek/mediatek,ovl-2l.yaml           | 5 +++++
 .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml   | 5 +++++
 .../bindings/display/mediatek/mediatek,postmask.yaml         | 5 +++++
 .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml  | 1 +
 10 files changed, 30 insertions(+)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +5 -0
index bc1c70d089ba..214b4a605cfa 100644
@@ -33,6 +33,11 @@ properties:
               - mediatek,mt8195-disp-aal
           - const:
               - mediatek,mt8173-disp-aal
+      - items:
+          - enum:
+              - mediatek,mt8186-disp-aal
+          - const:
+              - mediatek,mt8183-disp-aal
 
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +5 -0
index fc40e2981eaa..6aeb53d2dfe7 100644
@@ -30,6 +30,11 @@ properties:
               - mediatek,mt8195-disp-ccorr
           - const:
               - mediatek,mt8192-disp-ccorr
+      - items:
+          - enum:
+              - mediatek,mt8186-disp-ccorr
+          - const:
+              - mediatek,mt8183-disp-ccorr
 
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +1 -0
index 22ed5d368cbe..0458b30bf6d1 100644
@@ -37,6 +37,7 @@ properties:
       - items:
           - enum:
               - mediatek,mt8183-disp-color
+              - mediatek,mt8186-disp-color
               - mediatek,mt8192-disp-color
               - mediatek,mt8195-disp-color
           - const:
Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -0
index 2a82792b2625..60e192189c12 100644
@@ -26,6 +26,7 @@ properties:
           - const: mediatek,mt8183-disp-dither
       - items:
           - enum:
+              - mediatek,mt8186-disp-dither
               - mediatek,mt8192-disp-dither
               - mediatek,mt8195-disp-dither
           - const:
Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -0
index 45f88bdf07bb..8bf270d59a6e 100644
@@ -27,6 +27,7 @@ properties:
           - const: mediatek,mt8183-disp-gamma
       - items:
           - enum:
+              - mediatek,mt8186-disp-gamma
               - mediatek,mt8192-disp-gamma
               - mediatek,mt8195-disp-gamma
           - const:
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +1 -0
index 0378933201b4..edf5816cf7b4 100644
@@ -29,6 +29,7 @@ properties:
       - mediatek,mt8167-disp-mutex
       - mediatek,mt8173-disp-mutex
       - mediatek,mt8183-disp-mutex
+      - mediatek,mt8186-disp-mutex
       - mediatek,mt8192-disp-mutex
       - mediatek,mt8195-disp-mutex
 
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +5 -0
index 611a2dbdefa4..2f29c9d1ce61 100644
@@ -25,6 +25,11 @@ properties:
           - const: mediatek,mt8183-disp-ovl-2l
       - items:
           - const: mediatek,mt8192-disp-ovl-2l
+      - items:
+          - enum:
+              - mediatek,mt8186-disp-ovl-2l
+          - const:
+              - mediatek,mt8192-disp-ovl-2l
 
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +5 -0
index 88ba3f27b0e4..4204a780610f 100644
@@ -40,6 +40,11 @@ properties:
               - mediatek,mt8195-disp-ovl
           - const:
               - mediatek,mt8183-disp-ovl
+      - items:
+          - enum:
+              - mediatek,mt8186-disp-ovl
+          - const:
+              - mediatek,mt8192-disp-ovl
 
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +5 -0
index 6ac1da2e8871..e42170874b24 100644
@@ -23,6 +23,11 @@ properties:
     oneOf:
       - items:
           - const: mediatek,mt8192-disp-postmask
+      - items:
+          - enum:
+              - mediatek,mt8186-disp-postmask
+          - const:
+              - mediatek,mt8192-disp-postmask
 
   reg:
     maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +1 -0
index 56368c10d904..9f7eee8a3407 100644
@@ -39,6 +39,7 @@ properties:
               - mediatek,mt2701-disp-rdma
       - items:
           - enum:
+              - mediatek,mt8186-disp-rdma
               - mediatek,mt8192-disp-rdma
           - const:
               - mediatek,mt8183-disp-rdma
Signature · 1 line
2.18.0
#9 lore raw

PATCH v5 6/6 drm/mediatek: add display support for MT8186

In reply to Rex-BC Chen

From: Yongqiang Niu <[email protected]>

Add mmsys driver data and compatible for MT8186 in mtk_drm_drv.c.

---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +33 -0
index 56ff8c57ef8f..be582e64d067 100644
@@ -158,6 +158,24 @@ static const enum mtk_ddp_comp_id mt8183_mtk_ddp_ext[] = {
 	DDP_COMPONENT_DPI0,
 };
 
+static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = {
+	DDP_COMPONENT_OVL0,
+	DDP_COMPONENT_RDMA0,
+	DDP_COMPONENT_COLOR0,
+	DDP_COMPONENT_CCORR,
+	DDP_COMPONENT_AAL0,
+	DDP_COMPONENT_GAMMA,
+	DDP_COMPONENT_POSTMASK0,
+	DDP_COMPONENT_DITHER,
+	DDP_COMPONENT_DSI0,
+};
+
+static const enum mtk_ddp_comp_id mt8186_mtk_ddp_ext[] = {
+	DDP_COMPONENT_OVL_2L0,
+	DDP_COMPONENT_RDMA1,
+	DDP_COMPONENT_DPI0,
+};
+
 static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = {
 	DDP_COMPONENT_OVL0,
 	DDP_COMPONENT_OVL_2L0,
@@ -221,6 +239,13 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
 	.ext_len = ARRAY_SIZE(mt8183_mtk_ddp_ext),
 };
 
+static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
+	.main_path = mt8186_mtk_ddp_main,
+	.main_len = ARRAY_SIZE(mt8186_mtk_ddp_main),
+	.ext_path = mt8186_mtk_ddp_ext,
+	.ext_len = ARRAY_SIZE(mt8186_mtk_ddp_ext),
+};
+
 static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {
 	.main_path = mt8192_mtk_ddp_main,
 	.main_len = ARRAY_SIZE(mt8192_mtk_ddp_main),
@@ -463,6 +488,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
 	  .data = (void *)MTK_DISP_MUTEX },
 	{ .compatible = "mediatek,mt8183-disp-mutex",
 	  .data = (void *)MTK_DISP_MUTEX },
+	{ .compatible = "mediatek,mt8186-disp-mutex",
+	  .data = (void *)MTK_DISP_MUTEX },
 	{ .compatible = "mediatek,mt8192-disp-mutex",
 	  .data = (void *)MTK_DISP_MUTEX },
 	{ .compatible = "mediatek,mt8173-disp-od",
@@ -511,12 +538,16 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
 	  .data = (void *)MTK_DPI },
 	{ .compatible = "mediatek,mt8183-dpi",
 	  .data = (void *)MTK_DPI },
+	{ .compatible = "mediatek,mt8186-dpi",
+	  .data = (void *)MTK_DPI },
 	{ .compatible = "mediatek,mt2701-dsi",
 	  .data = (void *)MTK_DSI },
 	{ .compatible = "mediatek,mt8173-dsi",
 	  .data = (void *)MTK_DSI },
 	{ .compatible = "mediatek,mt8183-dsi",
 	  .data = (void *)MTK_DSI },
+	{ .compatible = "mediatek,mt8186-dsi",
+	  .data = (void *)MTK_DSI },
 	{ }
 };
 
@@ -533,6 +564,8 @@ static const struct of_device_id mtk_drm_of_ids[] = {
 	  .data = &mt8173_mmsys_driver_data},
 	{ .compatible = "mediatek,mt8183-mmsys",
 	  .data = &mt8183_mmsys_driver_data},
+	{ .compatible = "mediatek,mt8186-mmsys",
+	  .data = &mt8186_mmsys_driver_data},
 	{ .compatible = "mediatek,mt8192-mmsys",
 	  .data = &mt8192_mmsys_driver_data},
 	{ }
Signature · 1 line
2.18.0