add display support for MediaTek SoC MT8186
Subsystems (6)
v8 cover add display support for MediaTek SoC MT8186
v8:
1. Revise [1/5] dt-bindings: display: mediatek: add aal binding for MT8183.
v7:
1. Rebase to chunkuang.hu/linux.git mediatek-drm-fixes
v6:
1. Remove mmsys patches which are accepted.
2. Fix error of dt-binding.
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.
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 (4):
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
.../display/mediatek/mediatek,aal.yaml | 9 +++-- .../display/mediatek/mediatek,ccorr.yaml | 5 ++- .../display/mediatek/mediatek,color.yaml | 7 ++-- .../display/mediatek/mediatek,dither.yaml | 4 +-- .../display/mediatek/mediatek,gamma.yaml | 4 +-- .../display/mediatek/mediatek,mutex.yaml | 25 ++++++-------- .../display/mediatek/mediatek,ovl-2l.yaml | 4 +++ .../display/mediatek/mediatek,ovl.yaml | 8 +++-- .../display/mediatek/mediatek,postmask.yaml | 4 +++ .../display/mediatek/mediatek,rdma.yaml | 7 ++-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +++++++++++++++++++ 11 files changed, 77 insertions(+), 33 deletions(-)
Signature · 1 line
2.18.0
PATCH v8 1/5 dt-bindings: display: mediatek: add aal binding for MT8183
Add aal binding for MT8183.
--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +3 -1
@@ -22,7 +22,9 @@ properties: compatible: oneOf: - items: - - const: mediatek,mt8173-disp-aal + - enum: + - mediatek,mt8173-disp-aal + - mediatek,mt8183-disp-aal - items: - enum: - mediatek,mt2712-disp-aal
Signature · 1 line
2.18.0
Re: [PATCH V8 1/5] dt-bindings: display: mediatek: add aal binding for MT8183
Quoted 12 lines · Rex-BC Chen
Add aal binding for MT8183.
Signed-off-by Rex-BC Chen <[email protected]>--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +0
-0
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 27
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +3
-1@@ -22,7 +22,9 @@ properties: compatible: oneOf: - items: - - const: mediatek,mt8173-disp-aal + - enum: + - mediatek,mt8173-disp-aal + - mediatek,mt8183-disp-aal
This should not be under items. You have just one element here, so directly "enum" under oneOf.
Best regards,
Krzysztof
Re: [PATCH V8 1/5] dt-bindings: display: mediatek: add aal binding for MT8183
Quoted 34 lines · Krzysztof Kozlowski
Quoted 21 lines · Rex-BC Chen
Add aal binding for MT8183.
Signed-off-by Rex-BC Chen <[email protected]>--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
index61f0ed1e388f..eb0299b80522100644
---
a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y aml
+++
b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.y amlDocumentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml properties: · line 27
Quoted 7 lines
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +3
-1@@ -22,7 +22,9 @@ properties: compatible: oneOf: - items: - - const: mediatek,mt8173-disp-aal + - enum: + - mediatek,mt8173-disp-aal + - mediatek,mt8183-disp-aalThis should not be under items. You have just one element here, so directly "enum" under oneOf.
Quoted 2 lines
Best regards,
Krzysztof
Hello Krzysztof,
OK, I will do this in next version.
Thanks!
BRs,
Rex
PATCH v8 2/5 dt-bindings: display: mediatek: revise enum to const
In reply to Rex-BC ChenThere 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 | 3 +-- .../bindings/display/mediatek/mediatek,ccorr.yaml | 3 +-- .../bindings/display/mediatek/mediatek,color.yaml | 6 ++---- .../bindings/display/mediatek/mediatek,dither.yaml | 3 +-- .../bindings/display/mediatek/mediatek,gamma.yaml | 3 +-- .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 6 ++---- .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 6 ++---- 7 files changed, 10 insertions(+), 20 deletions(-)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +1 -2
@@ -31,8 +31,7 @@ properties: - mediatek,mt8183-disp-aal - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal - - enum: - - mediatek,mt8173-disp-aal + - const: mediatek,mt8173-disp-aal reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -2
@@ -28,8 +28,7 @@ properties: - items: - enum: - mediatek,mt8195-disp-ccorr - - enum: - - mediatek,mt8192-disp-ccorr + - const: mediatek,mt8192-disp-ccorr reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +2 -4
@@ -32,15 +32,13 @@ properties: - enum: - mediatek,mt7623-disp-color - mediatek,mt2712-disp-color - - enum: - - mediatek,mt2701-disp-color + - const: mediatek,mt2701-disp-color - items: - enum: - mediatek,mt8183-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - - enum: - - mediatek,mt8173-disp-color + - const: mediatek,mt8173-disp-color reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +1 -2
@@ -28,8 +28,7 @@ properties: - enum: - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - - enum: - - mediatek,mt8183-disp-dither + - const: mediatek,mt8183-disp-dither reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +1 -2
@@ -29,8 +29,7 @@ properties: - enum: - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - - enum: - - mediatek,mt8183-disp-gamma + - const: mediatek,mt8183-disp-gamma reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +2 -4
@@ -33,13 +33,11 @@ properties: - enum: - mediatek,mt7623-disp-ovl - mediatek,mt2712-disp-ovl - - enum: - - mediatek,mt2701-disp-ovl + - const: mediatek,mt2701-disp-ovl - items: - enum: - mediatek,mt8195-disp-ovl - - enum: - - mediatek,mt8183-disp-ovl + - const: mediatek,mt8183-disp-ovl reg: maxItems: 1
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +2 -4
@@ -35,13 +35,11 @@ properties: - enum: - mediatek,mt7623-disp-rdma - mediatek,mt2712-disp-rdma - - enum: - - mediatek,mt2701-disp-rdma + - const: mediatek,mt2701-disp-rdma - items: - enum: - mediatek,mt8192-disp-rdma - - enum: - - mediatek,mt8183-disp-rdma + - const: mediatek,mt8183-disp-rdma reg: maxItems: 1
Signature · 1 line
2.18.0
PATCH v8 3/5 dt-bindings: display: mediatek: change to use enum for mutex
In reply to Rex-BC ChenAll 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
@@ -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
PATCH v8 4/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 | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,color.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,mutex.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 4 ++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 25 insertions(+)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +4 -0
@@ -32,6 +32,10 @@ properties: - mediatek,mt8192-disp-aal - 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 +4 -0
@@ -29,6 +29,10 @@ properties: - enum: - 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
@@ -36,6 +36,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color + - mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - const: mediatek,mt8173-disp-color
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 - const: mediatek,mt8183-disp-dither
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 - const: mediatek,mt8183-disp-gamma
Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +1 -0
@@ -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 +4 -0
@@ -25,6 +25,10 @@ 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 +4 -0
@@ -38,6 +38,10 @@ properties: - enum: - 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 +4 -0
@@ -23,6 +23,10 @@ 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
@@ -38,6 +38,7 @@ properties: - const: 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
PATCH v8 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),
@@ -461,6 +486,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",
@@ -509,12 +536,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 }, { } };
@@ -531,6 +562,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