Add first version mt8188 vdosys0 driver
Subsystems (6)
v3 cover Add first version mt8188 vdosys0 driver
From: Nathan Lu <[email protected]>
This patch is to add first version mt8188 vdosys0 driver Modify and add new files include:
1. bindings documents
2. mtk mmsys
3. mtk mutex
4. mtk drm driver
Change in V3:
- based on [1]
[1] Change mmsys compatible for mt8195 mediatek-drm
- https://patchwork.kernel.org/project/linux-mediatek/list/?series=699386
- Modify mediatek,mmsys.yaml mt8188-mmsys name to mt8188-vdosys0
- Modify mtk-mmsys.c compatible name to mt8188-vdosys0
- Add DSI mutex in mtk-mutex.c
- Modify mtk_drm_drv.c mt8188-mmsysy name to mt8188-vdosys0
Change in V2:
- based on [2] and [3]
[2] Add MediaTek SoC(vdosys1) support for mt8195
- https://patchwork.kernel.org/project/linux-mediatek/list/?series=658416
[3] Add MediaTek SoC DRM (vdosys1) support for mt8195
- https://patchwork.kernel.org/project/linux-mediatek/list/?series=665269
- Seperate bindings doucment into mmsys/mutex/display 3 parts
- Remove redundent char in mediatek,gamma.yaml
- Add another mediatek,mt8188-disp-rdma in mediatek,rdma.yaml
- Remove io_start variable setting in mtk_drm_drv.c and mtk_mmsys.c
Nathan Lu (6):
dt-bindings: mediatek: modify VDOSYS0 display device tree
Documentations for MT8188
dt-bindings: mediatek: modify VDOSYS0 mmsys device tree Documentations
for MT8188
dt-bindings: mediatek: modify VDOSYS0 mutex device tree Documentations
for MT8188 soc: mediatek: add mtk-mmsys support for mt8188 vdosys0
soc: mediatek: add mtk-mutex support for mt8188 vdosys0 drm/mediatek: add mediatek-drm of vdosys0 support for mt8188
.../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + .../display/mediatek/mediatek,aal.yaml | 1 + .../display/mediatek/mediatek,ccorr.yaml | 1 + .../display/mediatek/mediatek,color.yaml | 1 + .../display/mediatek/mediatek,dither.yaml | 1 + .../display/mediatek/mediatek,gamma.yaml | 1 + .../display/mediatek/mediatek,ovl.yaml | 1 + .../display/mediatek/mediatek,postmask.yaml | 1 + .../display/mediatek/mediatek,rdma.yaml | 4 + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 +++ drivers/soc/mediatek/mt8188-mmsys.h | 149 ++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 ++ drivers/soc/mediatek/mtk-mutex.c | 53 +++++++ 14 files changed, 250 insertions(+) create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h
Signature · 1 line
2.18.0
PATCH v3 1/6 dt-bindings: mediatek: modify VDOSYS0 display device tree Documentations for MT8188
From: Nathan Lu <[email protected]>
modify VDOSYS0 display device tree Documentations for MT8188.
--- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 1 + .../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,ovl.yaml | 1 + .../bindings/display/mediatek/mediatek,postmask.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 4 ++++ 8 files changed, 11 insertions(+)
Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +1 -0
@@ -31,6 +31,7 @@ properties: - items: - enum: - mediatek,mt8186-disp-aal + - mediatek,mt8188-disp-aal - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal - const: mediatek,mt8183-disp-aal
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +1 -0
@@ -27,6 +27,7 @@ properties: - const: mediatek,mt8192-disp-ccorr - items: - enum: + - mediatek,mt8188-disp-ccorr - mediatek,mt8195-disp-ccorr - const: mediatek,mt8192-disp-ccorr - items:
Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +1 -0
@@ -37,6 +37,7 @@ properties: - enum: - mediatek,mt8183-disp-color - mediatek,mt8186-disp-color + - mediatek,mt8188-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
@@ -27,6 +27,7 @@ properties: - items: - enum: - mediatek,mt8186-disp-dither + - mediatek,mt8188-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
@@ -28,6 +28,7 @@ properties: - items: - enum: - mediatek,mt8186-disp-gamma + - mediatek,mt8188-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - const: mediatek,mt8183-disp-gamma
Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +1 -0
@@ -36,6 +36,7 @@ properties: - const: mediatek,mt2701-disp-ovl - items: - enum: + - mediatek,mt8188-disp-ovl - mediatek,mt8195-disp-ovl - const: mediatek,mt8183-disp-ovl - items:
Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +1 -0
@@ -26,6 +26,7 @@ properties: - items: - enum: - mediatek,mt8186-disp-postmask + - mediatek,mt8188-disp-postmask - const: mediatek,mt8192-disp-postmask reg:
Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +4 -0
@@ -31,6 +31,10 @@ properties: - const: mediatek,mt8183-disp-rdma - items: - const: mediatek,mt8195-disp-rdma + - items: + - enum: + - mediatek,mt8188-disp-rdma + - const: mediatek,mt8195-disp-rdma - items: - enum: - mediatek,mt7623-disp-rdma
Signature · 1 line
2.18.0
Re: [PATCH v3 1/6] dt-bindings: mediatek: modify VDOSYS0 display device tree Documentations for MT8188
Il 29/11/22 15:34, nathan.lu ha scritto:
Quoted 6 lines
From: Nathan Lu <[email protected]>
modify VDOSYS0 display device tree Documentations for MT8188.
Signed-off-by Nathan Lu <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>
PATCH v3 2/6 dt-bindings: mediatek: modify VDOSYS0 mmsys device tree Documentations for MT8188
In reply to nathan.luFrom: Nathan Lu <[email protected]>
modify VDOSYS0 mmsys device tree Documentations for MT8188.
--- .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +4 -0
@@ -47,6 +47,10 @@ properties: - const: mediatek,mt2701-mmsys - const: syscon + - items: + - const: mediatek,mt8188-vdosys0 + - const: syscon + - items: - const: mediatek,mt8195-vdosys0 - const: mediatek,mt8195-mmsys
Signature · 1 line
2.18.0
Re: [PATCH v3 2/6] dt-bindings: mediatek: modify VDOSYS0 mmsys device tree Documentations for MT8188
Quoted 14 lines · nathan.lu
From: Nathan Lu <[email protected]>
modify VDOSYS0 mmsys device tree Documentations for MT8188.
Signed-off-by Nathan Lu <[email protected]>--- .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +0
-0
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml properties: · line 51
Quoted 5 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +2
-0@@ -47,6 +47,10 @@ properties: - const: mediatek,mt2701-mmsys - const: syscon + - items: + - const: mediatek,mt8188-vdosys0
Why this is not part of previous enum?
Best regards,
Krzysztof
AngeloGioacchino Del Regno
maintainerRe: [PATCH v3 2/6] dt-bindings: mediatek: modify VDOSYS0 mmsys device tree Documentations for MT8188
In reply to nathan.luIl 29/11/22 15:34, nathan.lu ha scritto:
Quoted 14 lines
From: Nathan Lu <[email protected]>
modify VDOSYS0 mmsys device tree Documentations for MT8188.
Signed-off-by Nathan Lu <[email protected]>--- .../devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml | 4 ++++ 1 file changed, 4 insertions(+)Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +0
-0
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml properties: · line 51
Quoted 5 lines
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml +2
-0@@ -47,6 +47,10 @@ properties: - const: mediatek,mt2701-mmsys - const: syscon + - items: + - const: mediatek,mt8188-vdosys0
The devicetree node will be like:
something: something@somewhere {
compatible = "mediatek,mt8188-vdosys0", "syscon";
....
};....and will never get any additional compatible string, as when you'll add vdosys1 support, we'll get a similar node like:
something_else: something_else@somewhere_else {
comaptible = "mediatek,mt8188-vdosys1", "syscon";
....
};...so this should go upper in the enum that's listing all of the mediatek,mtXXXX-mmsys compatibles, specifically after mediatek,mt8186-mmsys.
Please fix.
Regards,
Angelo
PATCH v3 3/6 dt-bindings: mediatek: modify VDOSYS0 mutex device tree Documentations for MT8188
In reply to nathan.luFrom: Nathan Lu <[email protected]>
modify VDOSYS0 mutex device tree Documentations for MT8188.
--- .../devicetree/bindings/soc/mediatek/mediatek,mutex.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/soc/mediatek/mediatek,mutex.yaml +1 -0
@@ -32,6 +32,7 @@ properties: - mediatek,mt8183-disp-mutex - mediatek,mt8186-disp-mutex - mediatek,mt8186-mdp3-mutex + - mediatek,mt8188-disp-mutex - mediatek,mt8192-disp-mutex - mediatek,mt8195-disp-mutex
Signature · 1 line
2.18.0
PATCH v3 4/6 soc: mediatek: add mtk-mmsys support for mt8188 vdosys0
In reply to nathan.luFrom: Nathan Lu <[email protected]>
1. add mt8188 mmsys
2. add mt8188 vdosys0 routing table settings
--- drivers/soc/mediatek/mt8188-mmsys.h | 149 ++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 11 ++ 2 files changed, 160 insertions(+) create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h
drivers/soc/mediatek/mt8188-mmsys.h new file +149 -0
@@ -0,0 +1,149 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef __SOC_MEDIATEK_MT8188_MMSYS_H +#define __SOC_MEDIATEK_MT8188_MMSYS_H + +#define MT8188_VDO0_OVL_MOUT_EN 0xf14 +#define MT8188_MOUT_DISP_OVL0_TO_DISP_RDMA0 BIT(0) +#define MT8188_MOUT_DISP_OVL0_TO_DISP_WDMA0 BIT(1) +#define MT8188_MOUT_DISP_OVL0_TO_DISP_OVL1 BIT(2) +#define MT8188_MOUT_DISP_OVL1_TO_DISP_RDMA1 BIT(4) +#define MT8188_MOUT_DISP_OVL1_TO_DISP_WDMA1 BIT(5) +#define MT8188_MOUT_DISP_OVL1_TO_DISP_OVL0 BIT(6) + +#define MT8188_VDO0_SEL_IN 0xf34 +#define MT8188_VDO0_SEL_OUT 0xf38 + +#define MT8188_VDO0_DISP_RDMA_SEL 0xf40 +#define MT8188_SOUT_DISP_RDMA0_TO_MASK GENMASK(2, 0) +#define MT8188_SOUT_DISP_RDMA0_TO_DISP_COLOR0 (0 << 0) +#define MT8188_SOUT_DISP_RDMA0_TO_DISP_DSI0 (1 << 0) +#define MT8188_SOUT_DISP_RDMA0_TO_DISP_DP_INTF0 (5 << 0) +#define MT8188_SEL_IN_DISP_RDMA0_FROM_MASK GENMASK(8, 8) +#define MT8188_SEL_IN_DISP_RDMA0_FROM_DISP_OVL0 (0 << 8) +#define MT8188_SEL_IN_DISP_RDMA0_FROM_DISP_RSZ0 (1 << 8) + + +#define MT8188_VDO0_DSI0_SEL_IN 0xf44 +#define MT8188_SEL_IN_DSI0_FROM_MASK GENMASK(16, 16) +#define MT8188_SEL_IN_DSI0_FROM_DSC_WRAP0_OUT (0 << 16) +#define MT8188_SEL_IN_DSI0_FROM_DISP_DITHER0 (1 << 16) + +#define MT8188_VDO0_DP_INTF0_SEL_IN 0xf4C +#define MT8188_SEL_IN_DP_INTF0_FROM_MASK GENMASK(2, 0) +#define MT8188_SEL_IN_DP_INTF0_FROM_DSC_WRAP0C1_OUT (0 << 0) +#define MT8188_SEL_IN_DP_INTF0_FROM_VPP_MERGE (1 << 0) +#define MT8188_SEL_IN_DP_INTF0_FROM_DISP_DITHER0 (3 << 0) + +#define MT8188_VDO0_DISP_DITHER0_SEL_OUT 0xf58 +#define MT8188_SOUT_DISP_DITHER0_TO_MASK BIT(0) +#define MT8188_SOUT_DISP_DITHER0_TO_DSC_WRAP0_IN (0 << 0) +#define MT8188_SOUT_DISP_DITHER0_TO_DSI0 (1 << 0) +#define MT8188_SOUT_DISP_DITHER0_TO_VPP_MERGE0 (6 << 0) +#define MT8188_SOUT_DISP_DITHER0_TO_DP_INTF0 (7 << 0) + +#define MT8188_VDO0_VPP_MERGE_SEL 0xf60 +#define MT8188_SEL_IN_VPP_MERGE_FROM_MASK GENMASK(1, 0) +#define MT8188_SEL_IN_VPP_MERGE_FROM_DSC_WRAP0_OUT (0 << 0) +#define MT8188_SEL_IN_VPP_MERGE_FROM_DITHER0_OUT (3 << 0) + +#define MT8188_SOUT_VPP_MERGE_TO_MASK GENMASK(6, 4) +#define MT8188_SOUT_VPP_MERGE_TO_DSI1 (0 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_DP_INTF0 (1 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_SINA_VIRTUAL0 (2 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_DISP_WDMA1 (3 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_DSC_WRAP0_IN (4 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_DISP_WDMA0 (5 << 4) +#define MT8188_SOUT_VPP_MERGE_TO_DSC_WRAP1_IN_MASK GENMASK(11, 11) +#define MT8188_SOUT_VPP_MERGE_TO_DSC_WRAP1_IN (0 << 11) + +#define MT8188_VDO0_DSC_WARP_SEL 0xf64 +#define MT8188_SEL_IN_DSC_WRAP0C0_IN_FROM_MASK GENMASK(0, 0) +#define MT8188_SEL_IN_DSC_WRAP0C0_IN_FROM_DISP_DITHER0 (0 << 0) +#define MT8188_SEL_IN_DSC_WRAP0C0_IN_FROM_VPP_MERGE (1 << 0) +#define MT8188_SOUT_DSC_WRAP0_OUT_TO_MASK GENMASK(19, 16) +#define MT8188_SOUT_DSC_WRAP0_OUT_TO_DSI0 BIT(16) +#define MT8188_SOUT_DSC_WRAP0_OUT_TO_SINB_VIRTUAL0 BIT(17) +#define MT8188_SOUT_DSC_WRAP0_OUT_TO_VPP_MERGE BIT(18) +#define MT8188_SOUT_DSC_WRAP0_OUT_TO_DISP_WDMA0 BIT(19) + +static const struct mtk_mmsys_routes mmsys_mt8188_routing_table[] = { + { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8188_VDO0_OVL_MOUT_EN ,MT8188_MOUT_DISP_OVL0_TO_DISP_RDMA0 , +MT8188_MOUT_DISP_OVL0_TO_DISP_RDMA0 + }, { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_WDMA0 , +MT8188_VDO0_OVL_MOUT_EN ,MT8188_MOUT_DISP_OVL0_TO_DISP_WDMA0 , +MT8188_MOUT_DISP_OVL0_TO_DISP_WDMA0 + }, { +DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 , +MT8188_VDO0_DISP_RDMA_SEL ,MT8188_SEL_IN_DISP_RDMA0_FROM_MASK , +MT8188_SEL_IN_DISP_RDMA0_FROM_DISP_OVL0 + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_DSI0 , +MT8188_VDO0_DSI0_SEL_IN ,MT8188_SEL_IN_DSI0_FROM_MASK , +MT8188_SEL_IN_DSI0_FROM_DISP_DITHER0 + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_MERGE0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SEL_IN_VPP_MERGE_FROM_MASK , +MT8188_SEL_IN_VPP_MERGE_FROM_DITHER0_OUT + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_DSC0 , +MT8188_VDO0_DSC_WARP_SEL , +MT8188_SEL_IN_DSC_WRAP0C0_IN_FROM_MASK , +MT8188_SEL_IN_DSC_WRAP0C0_IN_FROM_DISP_DITHER0 + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_DP_INTF0 , +MT8188_VDO0_DP_INTF0_SEL_IN ,MT8188_SEL_IN_DP_INTF0_FROM_MASK , +MT8188_SEL_IN_DP_INTF0_FROM_DISP_DITHER0 + }, { +DDP_COMPONENT_DSC0 ,DDP_COMPONENT_MERGE0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SEL_IN_VPP_MERGE_FROM_MASK , +MT8188_SEL_IN_VPP_MERGE_FROM_DSC_WRAP0_OUT + }, { +DDP_COMPONENT_DSC0 ,DDP_COMPONENT_DSI0 , +MT8188_VDO0_DSI0_SEL_IN ,MT8188_SEL_IN_DSI0_FROM_MASK , +MT8188_SEL_IN_DSI0_FROM_DSC_WRAP0_OUT + }, { +DDP_COMPONENT_RDMA0 ,DDP_COMPONENT_COLOR0 , +MT8188_VDO0_DISP_RDMA_SEL ,MT8188_SOUT_DISP_RDMA0_TO_MASK , +MT8188_SOUT_DISP_RDMA0_TO_DISP_COLOR0 + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_DSI0 , +MT8188_VDO0_DISP_DITHER0_SEL_OUT , +MT8188_SOUT_DISP_DITHER0_TO_MASK , +MT8188_SOUT_DISP_DITHER0_TO_DSI0 + }, { +DDP_COMPONENT_DITHER0 ,DDP_COMPONENT_DP_INTF0 , +MT8188_VDO0_DISP_DITHER0_SEL_OUT , +MT8188_SOUT_DISP_DITHER0_TO_MASK , +MT8188_SOUT_DISP_DITHER0_TO_DP_INTF0 + }, { +DDP_COMPONENT_MERGE0 ,DDP_COMPONENT_DP_INTF0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SOUT_VPP_MERGE_TO_MASK , +MT8188_SOUT_VPP_MERGE_TO_DP_INTF0 + }, { +DDP_COMPONENT_MERGE0 ,DDP_COMPONENT_DPI0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SOUT_VPP_MERGE_TO_MASK , +MT8188_SOUT_VPP_MERGE_TO_SINA_VIRTUAL0 + }, { +DDP_COMPONENT_MERGE0 ,DDP_COMPONENT_WDMA0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SOUT_VPP_MERGE_TO_MASK , +MT8188_SOUT_VPP_MERGE_TO_DISP_WDMA0 + }, { +DDP_COMPONENT_MERGE0 ,DDP_COMPONENT_DSC0 , +MT8188_VDO0_VPP_MERGE_SEL ,MT8188_SOUT_VPP_MERGE_TO_MASK , +MT8188_SOUT_VPP_MERGE_TO_DSC_WRAP0_IN + }, { +DDP_COMPONENT_DSC0 ,DDP_COMPONENT_DSI0 , +MT8188_VDO0_DSC_WARP_SEL ,MT8188_SOUT_DSC_WRAP0_OUT_TO_MASK , +MT8188_SOUT_DSC_WRAP0_OUT_TO_DSI0 + }, { +DDP_COMPONENT_DSC0 ,DDP_COMPONENT_MERGE0 , +MT8188_VDO0_DSC_WARP_SEL ,MT8188_SOUT_DSC_WRAP0_OUT_TO_MASK , +MT8188_SOUT_DSC_WRAP0_OUT_TO_VPP_MERGE + }, +}; + +#endif /* __SOC_MEDIATEK_MT8188_MMSYS_H */
drivers/soc/mediatek/mtk-mmsys.c +11 -0
@@ -16,6 +16,7 @@#include "mt8167-mmsys.h" #include "mt8183-mmsys.h" #include "mt8186-mmsys.h" +#include "mt8188-mmsys.h" #include "mt8192-mmsys.h" #include "mt8195-mmsys.h" #include "mt8365-mmsys.h"
@@ -67,6 +68,12 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B, }; +static const struct mtk_mmsys_driver_data mt8188_vdosys0_driver_data = { + .clk_driver ="clk-mt8188-vdo0" , + .routes = mmsys_mt8188_routing_table, + .num_routes =ARRAY_SIZE (mmsys_mt8188_routing_table), +}; +static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { .clk_driver ="clk-mt8192-mm" , .routes = mmsys_mt8192_routing_table,
@@ -299,6 +306,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { .compatible = "mediatek,mt8186-mmsys", .data = &mt8186_mmsys_driver_data, }, + { + .compatible = "mediatek,mt8188-vdosys0", + .data = &mt8188_vdosys0_driver_data, + }, { .compatible = "mediatek,mt8192-mmsys", .data = &mt8192_mmsys_driver_data,
Signature · 1 line
2.18.0
Re: [PATCH v3 4/6] soc: mediatek: add mtk-mmsys support for mt8188 vdosys0
Il 29/11/22 15:35, nathan.lu ha scritto:
Quoted 7 lines
From: Nathan Lu <[email protected]>
1. add mt8188 mmsys
2. add mt8188 vdosys0 routing table settingsSigned-off-by amy zhang <[email protected]>Signed-off-by Nathan Lu <[email protected]>
PATCH v3 5/6 soc: mediatek: add mtk-mutex support for mt8188 vdosys0
In reply to nathan.luFrom: Nathan Lu <[email protected]>
add mtk-mutex support for mt8188 vdosys0.
--- drivers/soc/mediatek/mtk-mutex.c | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/soc/mediatek/mtk-mutex.c +53 -0
@@ -116,6 +116,21 @@#define MT8173_MUTEX_MOD_DISP_PWM1 24#define MT8173_MUTEX_MOD_DISP_OD 25 +#define MT8188_MUTEX_MOD_DISP_OVL0 0 +#define MT8188_MUTEX_MOD_DISP_WDMA0 1 +#define MT8188_MUTEX_MOD_DISP_RDMA0 2 +#define MT8188_MUTEX_MOD_DISP_COLOR0 3 +#define MT8188_MUTEX_MOD_DISP_CCORR0 4 +#define MT8188_MUTEX_MOD_DISP_AAL0 5 +#define MT8188_MUTEX_MOD_DISP_GAMMA0 6 +#define MT8188_MUTEX_MOD_DISP_DITHER0 7 +#define MT8188_MUTEX_MOD_DISP_DSI0 8 +#define MT8188_MUTEX_MOD_DISP_DSC_WRAP0_CORE0 9 +#define MT8188_MUTEX_MOD_DISP_VPP_MERGE 20 +#define MT8188_MUTEX_MOD_DISP_DP_INTF0 21 +#define MT8188_MUTEX_MOD_DISP_POSTMASK0 24 +#define MT8188_MUTEX_MOD2_DISP_PWM0 33 +#define MT8195_MUTEX_MOD_DISP_OVL0 0#define MT8195_MUTEX_MOD_DISP_WDMA0 1#define MT8195_MUTEX_MOD_DISP_RDMA0 2
@@ -180,6 +195,8 @@#define MT8167_MUTEX_SOF_DPI1 3#define MT8183_MUTEX_SOF_DSI0 1#define MT8183_MUTEX_SOF_DPI0 2 +#define MT8188_MUTEX_SOF_DSI0 1 +#define MT8188_MUTEX_SOF_DP_INTF0 3#define MT8195_MUTEX_SOF_DSI0 1#define MT8195_MUTEX_SOF_DSI1 2#define MT8195_MUTEX_SOF_DP_INTF0 3
@@ -189,6 +206,8 @@#define MT8183_MUTEX_EOF_DSI0 (MT8183_MUTEX_SOF_DSI0 << 6)#define MT8183_MUTEX_EOF_DPI0 (MT8183_MUTEX_SOF_DPI0 << 6) +#define MT8188_MUTEX_EOF_DSI0 (MT8188_MUTEX_SOF_DSI0 << 7) +#define MT8188_MUTEX_EOF_DP_INTF0 (MT8188_MUTEX_SOF_DP_INTF0 << 7)#define MT8195_MUTEX_EOF_DSI0 (MT8195_MUTEX_SOF_DSI0 << 7)#define MT8195_MUTEX_EOF_DSI1 (MT8195_MUTEX_SOF_DSI1 << 7)#define MT8195_MUTEX_EOF_DP_INTF0 (MT8195_MUTEX_SOF_DP_INTF0 << 7)
@@ -344,6 +363,23 @@ static const unsigned int mt8186_mdp_mutex_table_mod[MUTEX_MOD_IDX_MAX] = { [MUTEX_MOD_IDX_MDP_COLOR0] = MT8186_MUTEX_MOD_MDP_COLOR0, }; +static const unsigned int mt8188_mutex_mod[DDP_COMPONENT_ID_MAX ] = { + [DDP_COMPONENT_OVL0 ] =MT8188_MUTEX_MOD_DISP_OVL0 , + [DDP_COMPONENT_WDMA0 ] =MT8188_MUTEX_MOD_DISP_WDMA0 , + [DDP_COMPONENT_RDMA0 ] =MT8188_MUTEX_MOD_DISP_RDMA0 , + [DDP_COMPONENT_COLOR0 ] =MT8188_MUTEX_MOD_DISP_COLOR0 , + [DDP_COMPONENT_CCORR ] =MT8188_MUTEX_MOD_DISP_CCORR0 , + [DDP_COMPONENT_AAL0 ] =MT8188_MUTEX_MOD_DISP_AAL0 , + [DDP_COMPONENT_GAMMA ] =MT8188_MUTEX_MOD_DISP_GAMMA0 , + [DDP_COMPONENT_POSTMASK0 ] =MT8188_MUTEX_MOD_DISP_POSTMASK0 , + [DDP_COMPONENT_DITHER0 ] =MT8188_MUTEX_MOD_DISP_DITHER0 , + [DDP_COMPONENT_MERGE0 ] =MT8188_MUTEX_MOD_DISP_VPP_MERGE , + [DDP_COMPONENT_DSC0 ] =MT8188_MUTEX_MOD_DISP_DSC_WRAP0_CORE0 , + [DDP_COMPONENT_DSI0 ] =MT8188_MUTEX_MOD_DISP_DSI0 , + [DDP_COMPONENT_PWM0 ] =MT8188_MUTEX_MOD2_DISP_PWM0 , + [DDP_COMPONENT_DP_INTF0 ] =MT8188_MUTEX_MOD_DISP_DP_INTF0 , +}; +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 ,
@@ -435,6 +471,14 @@ static const unsigned int mt8186_mutex_sof[MUTEX_SOF_DSI3 + 1] = {* but also detect the error at end of frame(EAEOF) when EOF signal * arrives. */ +static const unsigned int mt8188_mutex_sof[DDP_MUTEX_SOF_MAX ] = { + [MUTEX_SOF_SINGLE_MODE ] =MUTEX_SOF_SINGLE_MODE , + [MUTEX_SOF_DSI0 ] = +MT8188_MUTEX_SOF_DSI0 |MT8188_MUTEX_EOF_DSI0 , + [MUTEX_SOF_DP_INTF0 ] = +MT8188_MUTEX_SOF_DP_INTF0 |MT8188_MUTEX_EOF_DP_INTF0 , +}; +static const unsigned int mt8195_mutex_sof[DDP_MUTEX_SOF_MAX ] = { [MUTEX_SOF_SINGLE_MODE ] =MUTEX_SOF_SINGLE_MODE , [MUTEX_SOF_DSI0 ] =MT8195_MUTEX_SOF_DSI0 |MT8195_MUTEX_EOF_DSI0 ,
@@ -505,6 +549,13 @@ static const struct mtk_mutex_data mt8186_mutex_driver_data = { .mutex_sof_reg = MT8183_MUTEX0_SOF0, }; +static const struct mtk_mutex_data mt8188_mutex_driver_data = { + .mutex_mod = mt8188_mutex_mod, + .mutex_sof = mt8188_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,
@@ -854,6 +905,8 @@ static const struct of_device_id mutex_driver_dt_match[] = { .data = &mt8186_mutex_driver_data}, { .compatible = "mediatek,mt8186-mdp3-mutex", .data = &mt8186_mdp_mutex_driver_data}, + { .compatible = "mediatek,mt8188-disp-mutex", + .data = &mt8188_mutex_driver_data}, { .compatible = "mediatek,mt8192-disp-mutex", .data = &mt8192_mutex_driver_data}, { .compatible = "mediatek,mt8195-disp-mutex",
Signature · 1 line
2.18.0
PATCH v3 6/6 drm/mediatek: add mediatek-drm of vdosys0 support for mt8188
In reply to nathan.luFrom: Nathan Lu <[email protected]>
add driver data of mt8188 vdosys0 to mediatek-drm and the sub driver.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +21 -0
@@ -176,6 +176,18 @@ static const enum mtk_ddp_comp_id mt8186_mtk_ddp_ext[] = { DDP_COMPONENT_DPI0, }; +static const enum mtk_ddp_comp_id mt8188_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_DITHER0 , +DDP_COMPONENT_DP_INTF0 , +}; +static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = {DDP_COMPONENT_OVL0 ,DDP_COMPONENT_OVL_2L0 ,
@@ -259,6 +271,11 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { .ext_len = ARRAY_SIZE(mt8186_mtk_ddp_ext), }; +static const struct mtk_mmsys_driver_data mt8188_vdosys0_driver_data = { + .main_path = mt8188_mtk_ddp_main, + .main_len =ARRAY_SIZE (mt8188_mtk_ddp_main), +}; +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),
@@ -516,6 +533,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8186-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, + { .compatible = "mediatek,mt8188-disp-mutex", + .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8192-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8195-disp-mutex",
@@ -600,6 +619,8 @@ static const struct of_device_id mtk_drm_of_ids[] = { .data = &mt8183_mmsys_driver_data}, { .compatible = "mediatek,mt8186-mmsys", .data = &mt8186_mmsys_driver_data}, + { .compatible = "mediatek,mt8188-vdosys0", + .data = &mt8188_vdosys0_driver_data}, { .compatible = "mediatek,mt8192-mmsys", .data = &mt8192_mmsys_driver_data}, { .compatible = "mediatek,mt8195-mmsys",
Signature · 1 line
2.18.0
Re: [PATCH v3 6/6] drm/mediatek: add mediatek-drm of vdosys0 support for mt8188
Il 29/11/22 15:35, nathan.lu ha scritto:
Quoted 6 lines
From: Nathan Lu <[email protected]>
add driver data of mt8188 vdosys0 to mediatek-drm and the sub driver.
Signed-off-by amy zhang <[email protected]>Signed-off-by Nathan Lu <[email protected]>
Since series [1] was explicitly requested by maintainers...
[1]: https://patchwork.kernel.org/project/linux-mediatek/list/?series=699386