add display support for MediaTek SoC MT8186
Subsystems (6)
v4 cover add display support for MediaTek SoC MT8186
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.
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 (2):
dt-bindings: arm: mediatek: mmsys: add support for MT8186
dt-bindings: display: mediatek: add MT8186 SoC binding
Yongqiang Niu (3):
soc: mediatek: mmsys: add mt8186 mmsys routing table
soc: mediatek: add MTK mutex support for MT8186 drm/mediatek: add display support for MT8186
.../bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + .../display/mediatek/mediatek,aal.yaml | 7 ++ .../display/mediatek/mediatek,ccorr.yaml | 5 + .../display/mediatek/mediatek,color.yaml | 1 + .../display/mediatek/mediatek,dither.yaml | 1 + .../display/mediatek/mediatek,gamma.yaml | 1 + .../display/mediatek/mediatek,mutex.yaml | 2 + .../display/mediatek/mediatek,ovl-2l.yaml | 5 + .../display/mediatek/mediatek,ovl.yaml | 5 + .../display/mediatek/mediatek,postmask.yaml | 5 + .../display/mediatek/mediatek,rdma.yaml | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +++++ drivers/soc/mediatek/mt8186-mmsys.h | 113 ++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 ++ drivers/soc/mediatek/mtk-mutex.c | 45 +++++++ 15 files changed, 236 insertions(+) create mode 100644 drivers/soc/mediatek/mt8186-mmsys.h
Signature · 1 line
2.18.0
PATCH v4 1/5 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
@@ -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
Re: [PATCH v4,1/5] dt-bindings: arm: mediatek: mmsys: add support for MT8186
Quoted 7 lines · Rex-BC Chen
Add "mediatek,mt8186-mmsys" to binding document.
Signed-off-by Rex-BC Chen <[email protected]>--- .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + 1 file changed, 1 insertion(+)
PATCH v4 2/5 dt-bindings: display: mediatek: add MT8186 SoC binding
In reply to Rex-BC ChenAdd MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.
--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 7 +++++++ .../bindings/display/mediatek/mediatek,ccorr.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,color.yaml | 1 + .../bindings/display/mediatek/mediatek,dither.yaml | 1 + .../bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../bindings/display/mediatek/mediatek,mutex.yaml | 2 ++ .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 5 +++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 33 insertions(+)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +7 -0
@@ -23,6 +23,8 @@ properties: oneOf: - items: - const: mediatek,mt8173-disp-aal + - items: + - const: mediatek,mt8183-disp-aal - items: - enum: - mediatek,mt2712-disp-aal
@@ -31,6 +33,11 @@ properties: - mediatek,mt8195-disp-aal - enum: - mediatek,mt8173-disp-aal + - items: + - enum: + - mediatek,mt8186-disp-aal + - enum: + - mediatek,mt8183-disp-aal reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +5 -0
@@ -30,6 +30,11 @@ properties: - mediatek,mt8195-disp-ccorr - enum: - mediatek,mt8192-disp-ccorr + - items: + - enum: + - mediatek,mt8186-disp-ccorr + - enum: + - mediatek,mt8183-disp-ccorr reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +1 -0
@@ -37,6 +37,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color + - mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - enum:
Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -0
@@ -26,6 +26,7 @@ properties: - const: mediatek,mt8183-disp-dither - items: - enum: + - mediatek,mt8186-disp-dither - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - enum:
Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -0
@@ -27,6 +27,7 @@ properties: - const: mediatek,mt8183-disp-gamma - items: - enum: + - mediatek,mt8186-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - enum:
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +2 -0
@@ -34,6 +34,8 @@ properties: - const: mediatek,mt8173-disp-mutex - items: - const: mediatek,mt8183-disp-mutex + - items: + - const: mediatek,mt8186-disp-mutex - items: - const: mediatek,mt8192-disp-mutex - items:
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +5 -0
@@ -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 + - enum: + - mediatek,mt8192-disp-ovl-2l reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +5 -0
@@ -40,6 +40,11 @@ properties: - mediatek,mt8195-disp-ovl - enum: - mediatek,mt8183-disp-ovl + - items: + - enum: + - mediatek,mt8186-disp-ovl + - enum: + - mediatek,mt8192-disp-ovl reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +5 -0
@@ -23,6 +23,11 @@ properties: oneOf: - items: - const: mediatek,mt8192-disp-postmask + - items: + - enum: + - mediatek,mt8186-disp-postmask + - enum: + - mediatek,mt8192-disp-postmask reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +1 -0
@@ -39,6 +39,7 @@ properties: - mediatek,mt2701-disp-rdma - items: - enum: + - mediatek,mt8186-disp-rdma - mediatek,mt8192-disp-rdma - enum: - mediatek,mt8183-disp-rdma
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [PATCH v4,2/5] dt-bindings: display: mediatek: add MT8186 SoC binding
Quoted 22 lines · Rex-BC Chen
Add MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.
Signed-off-by Rex-BC Chen <[email protected]>--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 7 +++++++ .../bindings/display/mediatek/mediatek,ccorr.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,color.yaml | 1 + .../bindings/display/mediatek/mediatek,dither.yaml | 1 + .../bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../bindings/display/mediatek/mediatek,mutex.yaml | 2 ++ .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 5 +++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 33 insertions(+)Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +0
-0
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 27
Quoted 5 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +2
-0@@ -23,6 +23,8 @@ properties: oneOf: - items: - const: mediatek,mt8173-disp-aal + - items: + - const: mediatek,mt8183-disp-aal
This patch is for 8186...
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 41
Quoted 13 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +5
-0- items: - enum: - mediatek,mt2712-disp-aal@@ -31,6 +33,11 @@ properties: - mediatek,mt8195-disp-aal - enum: - mediatek,mt8173-disp-aal + - items: + - enum: + - mediatek,mt8186-disp-aal + - enum: + - mediatek,mt8183-disp-aal
There won't be more than 1 fallback, so use const rather than enum.
Quoted 8 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +0
-0reg: maxItems: 1Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +0
-0
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml properties: · line 37
Quoted 8 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +5
-0@@ -30,6 +30,11 @@ properties: - mediatek,mt8195-disp-ccorr - enum: - mediatek,mt8192-disp-ccorr + - items: + - enum: + - mediatek,mt8186-disp-ccorr + - enum: + - mediatek,mt8183-disp-ccorr
Same here.
Quoted 44 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +0
-0reg: maxItems: 1Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +1
-0@@ -37,6 +37,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color + - mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - enum:Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1
-0@@ -26,6 +26,7 @@ properties: - const: mediatek,mt8183-disp-dither - items: - enum: + - mediatek,mt8186-disp-dither - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - enum:Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1
-0@@ -27,6 +27,7 @@ properties: - const: mediatek,mt8183-disp-gamma - items: - enum: + - mediatek,mt8186-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - enum:Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +0
-0
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml properties: · line 40
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +2
-0@@ -34,6 +34,8 @@ properties: - const: mediatek,mt8173-disp-mutex - items: - const: mediatek,mt8183-disp-mutex + - items: + - const: mediatek,mt8186-disp-mutex - items: - const: mediatek,mt8192-disp-mutex
All these single entry cases can be a single enum.
Quoted 65 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +0
-0- items:Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +5
-0@@ -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 + - enum: + - mediatek,mt8192-disp-ovl-2l reg: maxItems: 1Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +5
-0@@ -40,6 +40,11 @@ properties: - mediatek,mt8195-disp-ovl - enum: - mediatek,mt8183-disp-ovl + - items: + - enum: + - mediatek,mt8186-disp-ovl + - enum: + - mediatek,mt8192-disp-ovl reg: maxItems: 1Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +5
-0@@ -23,6 +23,11 @@ properties: oneOf: - items: - const: mediatek,mt8192-disp-postmask + - items: + - enum: + - mediatek,mt8186-disp-postmask + - enum: + - mediatek,mt8192-disp-postmask reg: maxItems: 1Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +1
-0@@ -39,6 +39,7 @@ properties: - mediatek,mt2701-disp-rdma - items: - enum: + - mediatek,mt8186-disp-rdma - mediatek,mt8192-disp-rdma - enum: - mediatek,mt8183-disp-rdmaSignature · 1 line
2.18.0
Re: [PATCH v4,2/5] dt-bindings: display: mediatek: add MT8186 SoC binding
Hello Rob,
Thanks for your review.
I add comments below:
Quoted 35 lines · Rob Herring
Quoted 34 lines · Rex-BC Chen
Add MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.
Signed-off-by Rex-BC Chen <[email protected]>--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 7 +++++++ .../bindings/display/mediatek/mediatek,ccorr.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,color.yaml | 1 + .../bindings/display/mediatek/mediatek,dither.yaml | 1 + .../bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../bindings/display/mediatek/mediatek,mutex.yaml | 2 ++ .../bindings/display/mediatek/mediatek,ovl-2l.yaml | 5 +++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 5 +++++ .../bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 33 insertions(+)diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
index225f9dd726d2..3a5416937293100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
Quoted 8 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 27
Quoted 6 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +2
-0@@ -23,6 +23,8 @@ properties: oneOf: - items: - const: mediatek,mt8173-disp-aal + - items: + - const: mediatek,mt8183-disp-aalThis patch is for 8186...
I will split it to another commit in next version.
Quoted 16 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 40
Quoted 13 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +5
-0- items: - enum: - mediatek,mt2712-disp-aal@@ -31,6 +33,11 @@ properties: - mediatek,mt8195-disp-aal - enum: - mediatek,mt8173-disp-aal + - items: + - enum: + - mediatek,mt8186-disp-aal + - enum: + - mediatek,mt8183-disp-aalThere won't be more than 1 fallback, so use const rather than enum.
I will modify it in next version.
Quoted 18 lines
Quoted 18 lines
(quoted diff) +0
-0reg: maxItems: 1diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml
index6894b6999412..8ac87b5896ac100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr .yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +0
-0@@ -30,6 +30,11 @@ properties: - mediatek,mt8195-disp-ccorr - enum:
Quoted 8 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml properties: · line 37
Quoted 6 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +5
-0- mediatek,mt8192-disp-ccorr + - items: + - enum: + - mediatek,mt8186-disp-ccorr + - enum: + - mediatek,mt8183-disp-ccorrSame here.
I will modify it in next version.
Quoted 78 lines
Quoted 78 lines
(quoted diff) +0
-0reg: maxItems: 1diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml
indexbc83155b3b4c..d0a4b9eb71fd100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,color .yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +1
-0@@ -37,6 +37,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color + - mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - enum:diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dithe
r.yamlb/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
index9d89297f5f1d..9a08514ed909100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1
-0@@ -26,6 +26,7 @@ properties: - const: mediatek,mt8183-disp-dither - items: - enum: + - mediatek,mt8186-disp-dither - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - enum:diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml
index247baad147b3..6d96f6736d91100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma .yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1
-0@@ -27,6 +27,7 @@ properties: - const: mediatek,mt8183-disp-gamma - items: - enum: + - mediatek,mt8186-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - enum:diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex .yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex .yaml
index6eca525eced0..55391b5c08c4100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex .yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex .yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +0
-0@@ -34,6 +34,8 @@ properties: - const: mediatek,mt8173-disp-mutex
Quoted 9 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml properties: · line 40
Quoted 6 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +2
-0- items: - const: mediatek,mt8183-disp-mutex + - items: + - const: mediatek,mt8186-disp-mutex - items: - const: mediatek,mt8192-disp-mutexAll these single entry cases can be a single enum.
I will modify it in next version.
Quoted 89 lines
Quoted 89 lines
(quoted diff) +0
-0- items:diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-
2l.yamlb/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
index611a2dbdefa4..f7f89485a5ae100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +5
-0@@ -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 + - enum: + - mediatek,mt8192-disp-ovl-2l reg: maxItems: 1diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml
indexe71f79bc2dee..110e6b2747bc100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y aml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.y amlDocumentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +5
-0@@ -40,6 +40,11 @@ properties: - mediatek,mt8195-disp-ovl - enum: - mediatek,mt8183-disp-ovl + - items: + - enum: + - mediatek,mt8186-disp-ovl + - enum: + - mediatek,mt8192-disp-ovl reg: maxItems: 1diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,postm
ask.yamlb/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
index6ac1da2e8871..22c333d09465100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +5
-0@@ -23,6 +23,11 @@ properties: oneOf: - items: - const: mediatek,mt8192-disp-postmask + - items: + - enum: + - mediatek,mt8186-disp-postmask + - enum: + - mediatek,mt8192-disp-postmask reg: maxItems: 1diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml
index8ef821641672..4f1c935cdf70100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yaml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma. yamlDocumentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +0
-0@@ -39,6 +39,7 @@ properties: - mediatek,mt2701-disp-rdma - items: - enum:
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +1
-0+ - mediatek,mt8186-disp-rdma - mediatek,mt8192-disp-rdma - enum: - mediatek,mt8183-disp-rdmaSignature · 1 line
2.18.0
BRs,
Rex
PATCH v4 3/5 soc: mediatek: mmsys: add mt8186 mmsys routing table
In reply to Rex-BC ChenFrom: Yongqiang Niu <[email protected]>
Add new routing table for MT8186.
In MT8186, there are two routing pipelines for internal and external display.
Internal display: OVL0->RDMA0->COLOR0->CCORR0->AAL0->GAMMA->POSTMASK0->
DITHER->DSI0
External display: OVL_2L0->RDMA1->DPI0
--- drivers/soc/mediatek/mt8186-mmsys.h | 113 ++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 +++ 2 files changed, 124 insertions(+) create mode 100644 drivers/soc/mediatek/mt8186-mmsys.h
drivers/soc/mediatek/mt8186-mmsys.h new file +113 -0
@@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __SOC_MEDIATEK_MT8186_MMSYS_H +#define __SOC_MEDIATEK_MT8186_MMSYS_H + +#define MT8186_MMSYS_OVL_CON 0xF04 +#define MT8186_MMSYS_OVL0_CON_MASK 0x3 +#define MT8186_MMSYS_OVL0_2L_CON_MASK 0xC +#define MT8186_OVL0_GO_BLEND BIT(0) +#define MT8186_OVL0_GO_BG BIT(1) +#define MT8186_OVL0_2L_GO_BLEND BIT(2) +#define MT8186_OVL0_2L_GO_BG BIT(3) +#define MT8186_DISP_RDMA0_SOUT_SEL 0xF0C +#define MT8186_RDMA0_SOUT_SEL_MASK 0xF +#define MT8186_RDMA0_SOUT_TO_DSI0 (0) +#define MT8186_RDMA0_SOUT_TO_COLOR0 (1) +#define MT8186_RDMA0_SOUT_TO_DPI0 (2) +#define MT8186_DISP_OVL0_2L_MOUT_EN 0xF14 +#define MT8186_OVL0_2L_MOUT_EN_MASK 0xF +#define MT8186_OVL0_2L_MOUT_TO_RDMA0 BIT(0) +#define MT8186_OVL0_2L_MOUT_TO_RDMA1 BIT(3) +#define MT8186_DISP_OVL0_MOUT_EN 0xF18 +#define MT8186_OVL0_MOUT_EN_MASK 0xF +#define MT8186_OVL0_MOUT_TO_RDMA0 BIT(0) +#define MT8186_OVL0_MOUT_TO_RDMA1 BIT(3) +#define MT8186_DISP_DITHER0_MOUT_EN 0xF20 +#define MT8186_DITHER0_MOUT_EN_MASK 0xF +#define MT8186_DITHER0_MOUT_TO_DSI0 BIT(0) +#define MT8186_DITHER0_MOUT_TO_RDMA1 BIT(2) +#define MT8186_DITHER0_MOUT_TO_DPI0 BIT(3) +#define MT8186_DISP_RDMA0_SEL_IN 0xF28 +#define MT8186_RDMA0_SEL_IN_MASK 0xF +#define MT8186_RDMA0_FROM_OVL0 0 +#define MT8186_RDMA0_FROM_OVL0_2L 2 +#define MT8186_DISP_DSI0_SEL_IN 0xF30 +#define MT8186_DSI0_SEL_IN_MASK 0xF +#define MT8186_DSI0_FROM_RDMA0 0 +#define MT8186_DSI0_FROM_DITHER0 1 +#define MT8186_DSI0_FROM_RDMA1 2 +#define MT8186_DISP_RDMA1_MOUT_EN 0xF3C +#define MT8186_RDMA1_MOUT_EN_MASK 0xF +#define MT8186_RDMA1_MOUT_TO_DPI0_SEL BIT(0) +#define MT8186_RDMA1_MOUT_TO_DSI0_SEL BIT(2) +#define MT8186_DISP_RDMA1_SEL_IN 0xF40 +#define MT8186_RDMA1_SEL_IN_MASK 0xF +#define MT8186_RDMA1_FROM_OVL0 0 +#define MT8186_RDMA1_FROM_OVL0_2L 2 +#define MT8186_RDMA1_FROM_DITHER0 3 +#define MT8186_DISP_DPI0_SEL_IN 0xF44 +#define MT8186_DPI0_SEL_IN_MASK 0xF +#define MT8186_DPI0_FROM_RDMA1 0 +#define MT8186_DPI0_FROM_DITHER0 1 +#define MT8186_DPI0_FROM_RDMA0 2 + +static const struct mtk_mmsys_routes mmsys_mt8186_routing_table[] = { + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_DISP_OVL0_MOUT_EN ,MT8186_OVL0_MOUT_EN_MASK , +MT8186_OVL0_MOUT_TO_RDMA0 + }, + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_DISP_RDMA0_SEL_IN ,MT8186_RDMA0_SEL_IN_MASK , +MT8186_RDMA0_FROM_OVL0 + }, + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_MMSYS_OVL_CON ,MT8186_MMSYS_OVL0_CON_MASK , +MT8186_OVL0_GO_BLEND + }, + { +DDP_COMPONENT_RDMA0 ,DDP_COMPONENT_COLOR0 , +MT8186_DISP_RDMA0_SOUT_SEL ,MT8186_RDMA0_SOUT_SEL_MASK , +MT8186_RDMA0_SOUT_TO_COLOR0 + }, + { +DDP_COMPONENT_DITHER ,DDP_COMPONENT_DSI0 , +MT8186_DISP_DITHER0_MOUT_EN ,MT8186_DITHER0_MOUT_EN_MASK , +MT8186_DITHER0_MOUT_TO_DSI0 , + }, + { +DDP_COMPONENT_DITHER ,DDP_COMPONENT_DSI0 , +MT8186_DISP_DSI0_SEL_IN ,MT8186_DSI0_SEL_IN_MASK , +MT8186_DSI0_FROM_DITHER0 + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_DISP_OVL0_2L_MOUT_EN ,MT8186_OVL0_2L_MOUT_EN_MASK , +MT8186_OVL0_2L_MOUT_TO_RDMA1 + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_DISP_RDMA1_SEL_IN ,MT8186_RDMA1_SEL_IN_MASK , +MT8186_RDMA1_FROM_OVL0_2L + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_MMSYS_OVL_CON ,MT8186_MMSYS_OVL0_2L_CON_MASK , +MT8186_OVL0_2L_GO_BLEND + }, + { +DDP_COMPONENT_RDMA1 ,DDP_COMPONENT_DPI0 , +MT8186_DISP_RDMA1_MOUT_EN ,MT8186_RDMA1_MOUT_EN_MASK , +MT8186_RDMA1_MOUT_TO_DPI0_SEL + }, + { +DDP_COMPONENT_RDMA1 ,DDP_COMPONENT_DPI0 , +MT8186_DISP_DPI0_SEL_IN ,MT8186_DPI0_SEL_IN_MASK , +MT8186_DPI0_FROM_RDMA1 + }, +}; + +#endif /* __SOC_MEDIATEK_MT8186_MMSYS_H */
drivers/soc/mediatek/mtk-mmsys.c +11 -0
@@ -15,6 +15,7 @@#include "mtk-mmsys.h" #include "mt8167-mmsys.h" #include "mt8183-mmsys.h" +#include "mt8186-mmsys.h" #include "mt8192-mmsys.h" #include "mt8365-mmsys.h"
@@ -56,6 +57,12 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), }; +static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { + .clk_driver ="clk-mt8186-mm" , + .routes = mmsys_mt8186_routing_table, + .num_routes =ARRAY_SIZE (mmsys_mt8186_routing_table), +}; +static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { .clk_driver ="clk-mt8192-mm" , .routes = mmsys_mt8192_routing_table,
@@ -242,6 +249,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { .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
Re: [PATCH v4,3/5] soc: mediatek: mmsys: add mt8186 mmsys routing table
Quoted 6 lines · Rex-BC Chen
From: Yongqiang Niu <[email protected]>
Add new routing table for MT8186.
In MT8186, there are two routing pipelines for internal and external display.
Quoted 6 lines
Internal display: OVL0->RDMA0->COLOR0->CCORR0->AAL0->GAMMA->POSTMASK0->
DITHER->DSI0External display:
OVL_2L0->RDMA1->DPI0Signed-off-by Yongqiang Niu <[email protected]>Signed-off-by Rex-BC Chen <[email protected]>
applied, thanks!
Quoted 161 lines
--- drivers/soc/mediatek/mt8186-mmsys.h | 113 ++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 +++ 2 files changed, 124 insertions(+)create mode 100644
drivers/soc/mediatek/mt8186-mmsys.hdrivers/soc/mediatek/mt8186-mmsys.h new file +113
-0@@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __SOC_MEDIATEK_MT8186_MMSYS_H +#define __SOC_MEDIATEK_MT8186_MMSYS_H + +#define MT8186_MMSYS_OVL_CON 0xF04 +#define MT8186_MMSYS_OVL0_CON_MASK 0x3 +#define MT8186_MMSYS_OVL0_2L_CON_MASK 0xC +#define MT8186_OVL0_GO_BLEND BIT(0) +#define MT8186_OVL0_GO_BG BIT(1) +#define MT8186_OVL0_2L_GO_BLEND BIT(2) +#define MT8186_OVL0_2L_GO_BG BIT(3) +#define MT8186_DISP_RDMA0_SOUT_SEL 0xF0C +#define MT8186_RDMA0_SOUT_SEL_MASK 0xF +#define MT8186_RDMA0_SOUT_TO_DSI0 (0) +#define MT8186_RDMA0_SOUT_TO_COLOR0 (1) +#define MT8186_RDMA0_SOUT_TO_DPI0 (2) +#define MT8186_DISP_OVL0_2L_MOUT_EN 0xF14 +#define MT8186_OVL0_2L_MOUT_EN_MASK 0xF +#define MT8186_OVL0_2L_MOUT_TO_RDMA0 BIT(0) +#define MT8186_OVL0_2L_MOUT_TO_RDMA1 BIT(3) +#define MT8186_DISP_OVL0_MOUT_EN 0xF18 +#define MT8186_OVL0_MOUT_EN_MASK 0xF +#define MT8186_OVL0_MOUT_TO_RDMA0 BIT(0) +#define MT8186_OVL0_MOUT_TO_RDMA1 BIT(3) +#define MT8186_DISP_DITHER0_MOUT_EN 0xF20 +#define MT8186_DITHER0_MOUT_EN_MASK 0xF +#define MT8186_DITHER0_MOUT_TO_DSI0 BIT(0) +#define MT8186_DITHER0_MOUT_TO_RDMA1 BIT(2) +#define MT8186_DITHER0_MOUT_TO_DPI0 BIT(3) +#define MT8186_DISP_RDMA0_SEL_IN 0xF28 +#define MT8186_RDMA0_SEL_IN_MASK 0xF +#define MT8186_RDMA0_FROM_OVL0 0 +#define MT8186_RDMA0_FROM_OVL0_2L 2 +#define MT8186_DISP_DSI0_SEL_IN 0xF30 +#define MT8186_DSI0_SEL_IN_MASK 0xF +#define MT8186_DSI0_FROM_RDMA0 0 +#define MT8186_DSI0_FROM_DITHER0 1 +#define MT8186_DSI0_FROM_RDMA1 2 +#define MT8186_DISP_RDMA1_MOUT_EN 0xF3C +#define MT8186_RDMA1_MOUT_EN_MASK 0xF +#define MT8186_RDMA1_MOUT_TO_DPI0_SEL BIT(0) +#define MT8186_RDMA1_MOUT_TO_DSI0_SEL BIT(2) +#define MT8186_DISP_RDMA1_SEL_IN 0xF40 +#define MT8186_RDMA1_SEL_IN_MASK 0xF +#define MT8186_RDMA1_FROM_OVL0 0 +#define MT8186_RDMA1_FROM_OVL0_2L 2 +#define MT8186_RDMA1_FROM_DITHER0 3 +#define MT8186_DISP_DPI0_SEL_IN 0xF44 +#define MT8186_DPI0_SEL_IN_MASK 0xF +#define MT8186_DPI0_FROM_RDMA1 0 +#define MT8186_DPI0_FROM_DITHER0 1 +#define MT8186_DPI0_FROM_RDMA0 2 + +static const struct mtk_mmsys_routes mmsys_mt8186_routing_table[] = { + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_DISP_OVL0_MOUT_EN ,MT8186_OVL0_MOUT_EN_MASK , +MT8186_OVL0_MOUT_TO_RDMA0 + }, + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_DISP_RDMA0_SEL_IN ,MT8186_RDMA0_SEL_IN_MASK , +MT8186_RDMA0_FROM_OVL0 + }, + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8186_MMSYS_OVL_CON ,MT8186_MMSYS_OVL0_CON_MASK , +MT8186_OVL0_GO_BLEND + }, + { +DDP_COMPONENT_RDMA0 ,DDP_COMPONENT_COLOR0 , +MT8186_DISP_RDMA0_SOUT_SEL ,MT8186_RDMA0_SOUT_SEL_MASK , +MT8186_RDMA0_SOUT_TO_COLOR0 + }, + { +DDP_COMPONENT_DITHER ,DDP_COMPONENT_DSI0 , +MT8186_DISP_DITHER0_MOUT_EN ,MT8186_DITHER0_MOUT_EN_MASK , +MT8186_DITHER0_MOUT_TO_DSI0 , + }, + { +DDP_COMPONENT_DITHER ,DDP_COMPONENT_DSI0 , +MT8186_DISP_DSI0_SEL_IN ,MT8186_DSI0_SEL_IN_MASK , +MT8186_DSI0_FROM_DITHER0 + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_DISP_OVL0_2L_MOUT_EN ,MT8186_OVL0_2L_MOUT_EN_MASK , +MT8186_OVL0_2L_MOUT_TO_RDMA1 + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_DISP_RDMA1_SEL_IN ,MT8186_RDMA1_SEL_IN_MASK , +MT8186_RDMA1_FROM_OVL0_2L + }, + { +DDP_COMPONENT_OVL_2L0 ,DDP_COMPONENT_RDMA1 , +MT8186_MMSYS_OVL_CON ,MT8186_MMSYS_OVL0_2L_CON_MASK , +MT8186_OVL0_2L_GO_BLEND + }, + { +DDP_COMPONENT_RDMA1 ,DDP_COMPONENT_DPI0 , +MT8186_DISP_RDMA1_MOUT_EN ,MT8186_RDMA1_MOUT_EN_MASK , +MT8186_RDMA1_MOUT_TO_DPI0_SEL + }, + { +DDP_COMPONENT_RDMA1 ,DDP_COMPONENT_DPI0 , +MT8186_DISP_DPI0_SEL_IN ,MT8186_DPI0_SEL_IN_MASK , +MT8186_DPI0_FROM_RDMA1 + }, +}; + +#endif /* __SOC_MEDIATEK_MT8186_MMSYS_H */ drivers/soc/mediatek/mtk-mmsys.c +11
-0@@ -15,6 +15,7 @@#include "mtk-mmsys.h" #include "mt8167-mmsys.h" #include "mt8183-mmsys.h" +#include "mt8186-mmsys.h" #include "mt8192-mmsys.h" #include "mt8365-mmsys.h" @@ -56,6 +57,12 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), }; +static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { + .clk_driver ="clk-mt8186-mm" , + .routes = mmsys_mt8186_routing_table, + .num_routes =ARRAY_SIZE (mmsys_mt8186_routing_table), +}; +static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { .clk_driver ="clk-mt8192-mm" , .routes = mmsys_mt8192_routing_table,@@ -242,6 +249,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { .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,
PATCH v4 4/5 soc: mediatek: add MTK mutex support for MT8186
In reply to Rex-BC ChenFrom: Yongqiang Niu <[email protected]>
Add MTK mutex support for MT8186 SoC.
We need MTK mutex to control timing of display modules and there are two display pipelines for MT8186 including internal and external display.
MTK mutex for internal display:
- Timing source: DSI
- Control modules: OVL0/RDMA0/COLOR0/CCORR/AAL0/GAMMA/POSTMASK0/DITHER
MTK mutex for external display:
- Timing source : DPI
- Control modules: OVL_2L0/RDMA1
--- drivers/soc/mediatek/mtk-mutex.c | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/soc/mediatek/mtk-mutex.c +45 -0
@@ -26,6 +26,23 @@#define INT_MUTEX BIT(1) +#define MT8186_MUTEX_MOD_DISP_OVL0 0 +#define MT8186_MUTEX_MOD_DISP_OVL0_2L 1 +#define MT8186_MUTEX_MOD_DISP_RDMA0 2 +#define MT8186_MUTEX_MOD_DISP_COLOR0 4 +#define MT8186_MUTEX_MOD_DISP_CCORR0 5 +#define MT8186_MUTEX_MOD_DISP_AAL0 7 +#define MT8186_MUTEX_MOD_DISP_GAMMA0 8 +#define MT8186_MUTEX_MOD_DISP_POSTMASK0 9 +#define MT8186_MUTEX_MOD_DISP_DITHER0 10 +#define MT8186_MUTEX_MOD_DISP_RDMA1 17 + +#define MT8186_MUTEX_SOF_SINGLE_MODE 0 +#define MT8186_MUTEX_SOF_DSI0 1 +#define MT8186_MUTEX_SOF_DPI0 2 +#define MT8186_MUTEX_EOF_DSI0 (MT8186_MUTEX_SOF_DSI0 << 6) +#define MT8186_MUTEX_EOF_DPI0 (MT8186_MUTEX_SOF_DPI0 << 6) +#define MT8167_MUTEX_MOD_DISP_PWM 1#define MT8167_MUTEX_MOD_DISP_OVL0 6#define MT8167_MUTEX_MOD_DISP_OVL1 7
@@ -226,6 +243,19 @@ static const unsigned int mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_WDMA0] = MT8183_MUTEX_MOD_DISP_WDMA0, }; +static const unsigned int mt8186_mutex_mod[DDP_COMPONENT_ID_MAX ] = { + [DDP_COMPONENT_AAL0 ] =MT8186_MUTEX_MOD_DISP_AAL0 , + [DDP_COMPONENT_CCORR ] =MT8186_MUTEX_MOD_DISP_CCORR0 , + [DDP_COMPONENT_COLOR0 ] =MT8186_MUTEX_MOD_DISP_COLOR0 , + [DDP_COMPONENT_DITHER ] =MT8186_MUTEX_MOD_DISP_DITHER0 , + [DDP_COMPONENT_GAMMA ] =MT8186_MUTEX_MOD_DISP_GAMMA0 , + [DDP_COMPONENT_OVL0 ] =MT8186_MUTEX_MOD_DISP_OVL0 , + [DDP_COMPONENT_OVL_2L0 ] =MT8186_MUTEX_MOD_DISP_OVL0_2L , + [DDP_COMPONENT_POSTMASK0 ] =MT8186_MUTEX_MOD_DISP_POSTMASK0 , + [DDP_COMPONENT_RDMA0 ] =MT8186_MUTEX_MOD_DISP_RDMA0 , + [DDP_COMPONENT_RDMA1 ] =MT8186_MUTEX_MOD_DISP_RDMA1 , +}; +static const unsigned int mt8192_mutex_mod[DDP_COMPONENT_ID_MAX ] = { [DDP_COMPONENT_AAL0 ] =MT8192_MUTEX_MOD_DISP_AAL0 , [DDP_COMPONENT_CCORR ] =MT8192_MUTEX_MOD_DISP_CCORR0 ,
@@ -264,6 +294,12 @@ static const unsigned int mt8183_mutex_sof[MUTEX_SOF_DSI3 + 1] = { [MUTEX_SOF_DPI0] = MT8183_MUTEX_SOF_DPI0 | MT8183_MUTEX_EOF_DPI0, }; +static const unsigned int mt8186_mutex_sof[MUTEX_SOF_DSI3 +1 ] = { + [MUTEX_SOF_SINGLE_MODE ] =MUTEX_SOF_SINGLE_MODE , + [MUTEX_SOF_DSI0 ] =MT8186_MUTEX_SOF_DSI0 |MT8186_MUTEX_EOF_DSI0 , + [MUTEX_SOF_DPI0 ] =MT8186_MUTEX_SOF_DPI0 |MT8186_MUTEX_EOF_DPI0 , +}; +static const struct mtk_mutex_data mt2701_mutex_driver_data = { .mutex_mod = mt2701_mutex_mod, .mutex_sof = mt2712_mutex_sof,
@@ -301,6 +337,13 @@ static const struct mtk_mutex_data mt8183_mutex_driver_data = { .no_clk = true, }; +static const struct mtk_mutex_data mt8186_mutex_driver_data = { + .mutex_mod = mt8186_mutex_mod, + .mutex_sof = mt8186_mutex_sof, + .mutex_mod_reg =MT8183_MUTEX0_MOD0 , + .mutex_sof_reg =MT8183_MUTEX0_SOF0 , +}; +static const struct mtk_mutex_data mt8192_mutex_driver_data = { .mutex_mod = mt8192_mutex_mod, .mutex_sof = mt8183_mutex_sof,
@@ -540,6 +583,8 @@ static const struct of_device_id mutex_driver_dt_match[] = { .data = &mt8173_mutex_driver_data}, { .compatible = "mediatek,mt8183-disp-mutex", .data = &mt8183_mutex_driver_data}, + { .compatible = "mediatek,mt8186-disp-mutex", + .data = &mt8186_mutex_driver_data}, { .compatible = "mediatek,mt8192-disp-mutex", .data = &mt8192_mutex_driver_data}, {},
Signature · 1 line
2.18.0
Matthias Brugger
maintainerRe: [PATCH v4,4/5] soc: mediatek: add MTK mutex support for MT8186
Quoted 11 lines · Rex-BC Chen
From: Yongqiang Niu <[email protected]>
Add MTK mutex support for MT8186 SoC.
We need MTK mutex to control timing of display modules and there are two display pipelines for MT8186 including internal and external display.MTK mutex for internal display:
- Timing source: DSI
- Control modules: OVL0/RDMA0/COLOR0/CCORR/AAL0/GAMMA/POSTMASK0/DITHER
Quoted 6 lines
MTK mutex for external display:
- Timing source : DPI
- Control modules: OVL_2L0/RDMA1Signed-off-by Yongqiang Niu <[email protected]>Signed-off-by Rex-BC Chen <[email protected]>
applied thanks
Quoted 88 lines
--- drivers/soc/mediatek/mtk-mutex.c | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)drivers/soc/mediatek/mtk-mutex.c +45
-0@@ -26,6 +26,23 @@#define INT_MUTEX BIT(1) +#define MT8186_MUTEX_MOD_DISP_OVL0 0 +#define MT8186_MUTEX_MOD_DISP_OVL0_2L 1 +#define MT8186_MUTEX_MOD_DISP_RDMA0 2 +#define MT8186_MUTEX_MOD_DISP_COLOR0 4 +#define MT8186_MUTEX_MOD_DISP_CCORR0 5 +#define MT8186_MUTEX_MOD_DISP_AAL0 7 +#define MT8186_MUTEX_MOD_DISP_GAMMA0 8 +#define MT8186_MUTEX_MOD_DISP_POSTMASK0 9 +#define MT8186_MUTEX_MOD_DISP_DITHER0 10 +#define MT8186_MUTEX_MOD_DISP_RDMA1 17 + +#define MT8186_MUTEX_SOF_SINGLE_MODE 0 +#define MT8186_MUTEX_SOF_DSI0 1 +#define MT8186_MUTEX_SOF_DPI0 2 +#define MT8186_MUTEX_EOF_DSI0 (MT8186_MUTEX_SOF_DSI0 << 6) +#define MT8186_MUTEX_EOF_DPI0 (MT8186_MUTEX_SOF_DPI0 << 6) +#define MT8167_MUTEX_MOD_DISP_PWM 1#define MT8167_MUTEX_MOD_DISP_OVL0 6#define MT8167_MUTEX_MOD_DISP_OVL1 7@@ -226,6 +243,19 @@ static const unsigned int mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_WDMA0] = MT8183_MUTEX_MOD_DISP_WDMA0, }; +static const unsigned int mt8186_mutex_mod[DDP_COMPONENT_ID_MAX ] = { + [DDP_COMPONENT_AAL0 ] =MT8186_MUTEX_MOD_DISP_AAL0 , + [DDP_COMPONENT_CCORR ] =MT8186_MUTEX_MOD_DISP_CCORR0 , + [DDP_COMPONENT_COLOR0 ] =MT8186_MUTEX_MOD_DISP_COLOR0 , + [DDP_COMPONENT_DITHER ] =MT8186_MUTEX_MOD_DISP_DITHER0 , + [DDP_COMPONENT_GAMMA ] =MT8186_MUTEX_MOD_DISP_GAMMA0 , + [DDP_COMPONENT_OVL0 ] =MT8186_MUTEX_MOD_DISP_OVL0 , + [DDP_COMPONENT_OVL_2L0 ] =MT8186_MUTEX_MOD_DISP_OVL0_2L , + [DDP_COMPONENT_POSTMASK0 ] =MT8186_MUTEX_MOD_DISP_POSTMASK0 , + [DDP_COMPONENT_RDMA0 ] =MT8186_MUTEX_MOD_DISP_RDMA0 , + [DDP_COMPONENT_RDMA1 ] =MT8186_MUTEX_MOD_DISP_RDMA1 , +}; +static const unsigned int mt8192_mutex_mod[DDP_COMPONENT_ID_MAX ] = { [DDP_COMPONENT_AAL0 ] =MT8192_MUTEX_MOD_DISP_AAL0 , [DDP_COMPONENT_CCORR ] =MT8192_MUTEX_MOD_DISP_CCORR0 ,@@ -264,6 +294,12 @@ static const unsigned int mt8183_mutex_sof[MUTEX_SOF_DSI3 + 1] = { [MUTEX_SOF_DPI0] = MT8183_MUTEX_SOF_DPI0 | MT8183_MUTEX_EOF_DPI0, }; +static const unsigned int mt8186_mutex_sof[MUTEX_SOF_DSI3 +1 ] = { + [MUTEX_SOF_SINGLE_MODE ] =MUTEX_SOF_SINGLE_MODE , + [MUTEX_SOF_DSI0 ] =MT8186_MUTEX_SOF_DSI0 |MT8186_MUTEX_EOF_DSI0 , + [MUTEX_SOF_DPI0 ] =MT8186_MUTEX_SOF_DPI0 |MT8186_MUTEX_EOF_DPI0 , +}; +static const struct mtk_mutex_data mt2701_mutex_driver_data = { .mutex_mod = mt2701_mutex_mod, .mutex_sof = mt2712_mutex_sof,@@ -301,6 +337,13 @@ static const struct mtk_mutex_data mt8183_mutex_driver_data = { .no_clk = true, }; +static const struct mtk_mutex_data mt8186_mutex_driver_data = { + .mutex_mod = mt8186_mutex_mod, + .mutex_sof = mt8186_mutex_sof, + .mutex_mod_reg =MT8183_MUTEX0_MOD0 , + .mutex_sof_reg =MT8183_MUTEX0_SOF0 , +}; +static const struct mtk_mutex_data mt8192_mutex_driver_data = { .mutex_mod = mt8192_mutex_mod, .mutex_sof = mt8183_mutex_sof,@@ -540,6 +583,8 @@ static const struct of_device_id mutex_driver_dt_match[] = { .data = &mt8173_mutex_driver_data}, { .compatible = "mediatek,mt8183-disp-mutex", .data = &mt8183_mutex_driver_data}, + { .compatible = "mediatek,mt8186-disp-mutex", + .data = &mt8186_mutex_driver_data}, { .compatible = "mediatek,mt8192-disp-mutex", .data = &mt8192_mutex_driver_data}, {},
PATCH v4 5/5 drm/mediatek: add display support for MT8186
In reply to Rex-BC ChenFrom: 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
@@ -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