Add MediaTek SoC DRM (vdosys1) support for mt8195
Subsystems (6)
v22 cover Add MediaTek SoC DRM (vdosys1) support for mt8195
The hardware path of vdosys1 with DPTx output need to go through by several modules, such as, OVL_ADAPTOR and MERGE.
Add DRM and these modules support by the patches below:
Changes in v22:
- rebase to next-20220525
- rebase to vdosys0 series v22
- separate dts to a new patch
Changes in v21:
- fix reviewer comment
- fix rdma and ethdr binding doc and dts
Changes in v20:
- fix reviewer comment
- update mmsys update bit api name
- add mtk_mmsys_update_bits error message if lose gce property
- list all mt8195 vdosys1 reset bits
Changes in v19:
- fix reviewer comment
- separate mt8195 mmsys component to a new patch
- separate mt8195 vdo0 and vdo1 routing table
- separate mmsys_write_reg api to a new patch and simplify write reg code
- separate mmsys 64 bit reset to a new patch
- separate mtk-mutex dp_intf1 component to a new patch
Changes in v18:
- fix reviewer comment
- fix rdma binding doc
- fix ethdr binding doc
- refine mmsys config cmdq support
- refine merge reset control flow, get reset control in probe function
- add ethdr reset control error handling and remove dbg log
- rebase to vdosys0 series v20 (ref [5])
Changes in v17:
- fix reviewer comment in v16
- separate ovl adaptor comp in mtk-mmsys and mtk-mutex
- separate mmsys config API
- move mdp_rdma binding yaml
- fix ovl adaptor pm runtime get sync timing issue
- rebase to vdosys0 series v19 (ref [5])
- rebase to [7] for modify vblank register change
Changes in v16:
- fix reviewer comment in v 15
- fix mtk_drm_ddp_comp.c alignment
- fix vdosys0 mmsys num before adding vdosys1 patch
Changes in v15:
- fix ethdr uppercase hex number in dts
Changes in v14:
- remove MTK_MMSYS 64 bit dependency
- add ethdr.yaml back and fix dt_schema check fail
Resend v13
- add related maintainer in maillist
Changes in v13:
- fix reviewer comment in v12
- fix rdma dt-binding format
- fix dts node naming
- fix 32 bit build error
- modify 64bit dependency for mtk-mmsys
- rebase to vdosys0 series v16. (ref [5])
Changes in v12:
- fix reviewer comment in v11
- modify mbox index
- refine dma dev for ovl_adaptor sub driver
Changes in v11:
- remove ethdr vblank spin lock
- refine ovl_adaptor print message
Changes in v10:
- refine ethdr reset control using devm_reset_control_array_get_optional_exclusive
- fix ovl_adaptor mtk_ovl_adaptor_clk_enable error handle issue
Changes in v9:
- rebase on kernel-5.16-rc1
- rebase on vdosys0 series v13. (ref [5])
- fix ovl_adaptor sub driver is brought up unintentionally
- fix clang build test fail- duplicate ethdr/mdp_rdma init_module/cleanup_module symbol issue
Changes in v8:
- separate merge async reset to new patch.
- separate drm ovl_adaptor sub driver to new patch.
- fix reviewer comment in v7.
Changes in v7:
- rebase on vdosys0 series v12 (ref[5])
- add dma description in ethdr binding document.
- refine vdosys1 bit definition of mmsys routing table.
- separate merge modification into 3 pathces.
- separate mutex modification into 2 patches.
- add plane color coding for mdp_rdma csc.
- move mdp_rdma pm control to ovl_adaptor.
- fix reviewer comment in v6.
Changes in v6:
- rebase on kernel-5.15-rc1.
- change mbox label to gce0 for dts node of vdosys1.
- modify mmsys reset num for mt8195.
- rebase on vdosys0 series v10. (ref [5])
- use drm to bring up ovl_adaptor driver.
- move drm iommu/mutex check from kms init to drm bind.
- modify rdma binding doc location. (Documentation/devicetree/bindings/arm/)
- modify for reviewer's comment in v5.
Changes in v5:
- add mmsys reset controller reference.
Changes in v4:
- use merge common driver for merge1~4.
- refine ovl_adaptor rdma driver.
- use ovl_adaptor ddp_comp function instead of ethdr.
- modify for reviewer's comment in v3.
Changes in v3:
- modify for reviewer's comment in v2.
- add vdosys1 2 pixels align limit.
- add mixer odd offset support.
Changes in v2:
- Merge PSEUDO_OVL and ETHDR into one DRM component.
- Add mmsys config API for vdosys1 hardware setting.
- Add mmsys reset control using linux reset framework.
This series are based on the following patch:
[1] arm64: dts: Add mediatek SoC mt8195 and evaluation board
[email protected] [2] arm64: dts: mt8195: add IOMMU and smi nodes [email protected] [3] arm64: dts: mt8195: add gce node [email protected] [4] [v2] arm64: dts: mt8195: add display node for vdosys0 [email protected] [5] Add MediaTek SoC DRM (vdosys0) support for mt8195 - v22 series [email protected] [6] dt-bindings: mediatek: mt8195: Add binding for MM IOMMU [email protected]
Nancy.Lin (24):
dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195
dt-bindings: reset: mt8195: add vdosys1 reset control bit
dt-bindings: mediatek: add ethdr definition for mt8195
soc: mediatek: add mtk-mmsys ethdr and mdp_rdma components
soc: mediatek: add mtk-mmsys support for mt8195 vdosys1
soc: mediatek: add mtk_mmsys_update_bits API
soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1
soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195
vdosys1
soc: mediatek: mmsys: add mmsys for support 64 reset bits
soc: mediatek: mmsys: add reset control for MT8195 vdosys1
soc: mediatek: add mtk-mutex component - dp_intf1
soc: mediatek: add mtk-mutex support for mt8195 vdosys1 drm/mediatek: add display MDP RDMA support for MT8195 drm/mediatek: add display merge advance config API for MT8195 drm/mediatek: add display merge start/stop API for cmdq support drm/mediatek: add display merge mute/unmute support for MT8195 drm/mediatek: add display merge async reset control drm/mediatek: add ETHDR support for MT8195 drm/mediatek: add mediatek-drm plane color encoding info drm/mediatek: add ovl_adaptor support for MT8195 drm/mediatek: add dma dev get function
drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support drm/mediatek: add drm ovl_adaptor sub driver for MT8195 drm/mediatek: add mediatek-drm of vdosys1 support for MT8195
.../display/mediatek/mediatek,ethdr.yaml | 188 +++++++ .../display/mediatek/mediatek,mdp-rdma.yaml | 88 +++ drivers/gpu/drm/mediatek/Makefile | 5 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 38 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 94 +++- .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 514 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 96 ++-- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 6 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 125 +++-- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 58 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 360 ++++++++---- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 25 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 1 + drivers/gpu/drm/mediatek/mtk_ethdr.c | 369 +++++++++++++ drivers/gpu/drm/mediatek/mtk_ethdr.h | 26 + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 315 +++++++++++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 20 + drivers/soc/mediatek/mt8195-mmsys.h | 146 +++++ drivers/soc/mediatek/mtk-mmsys.c | 134 +++-- drivers/soc/mediatek/mtk-mmsys.h | 1 + drivers/soc/mediatek/mtk-mutex.c | 37 ++ include/dt-bindings/reset/mt8195-resets.h | 45 ++ include/linux/soc/mediatek/mtk-mmsys.h | 25 + 24 files changed, 2479 insertions(+), 238 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.h create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.h
Signature · 1 line
2.18.0
PATCH v22 1/24 dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195
Add vdosys1 RDMA definition.
--- .../display/mediatek/mediatek,mdp-rdma.yaml | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml
Documentation/devicetree/bindings/display/mediatek/mediatek,mdp-rdma.yaml new file +88 -0
@@ -0,0 +1,88 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/mediatek/mediatek,mdp-rdma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek MDP RDMA + +maintainers: + - Chun-Kuang Hu <[email protected]> + - Philipp Zabel <[email protected]> + +description: + The MediaTek MDP RDMA stands for Read Direct Memory Access. + It provides real time data to the back-end panel driver, such as DSI, + DPI and DP_INTF. + It contains one line buffer to store the sufficient pixel data. + RDMA device node must be siblings to the central MMSYS_CONFIG node. + For a description of the MMSYS_CONFIG binding, see + Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml for details. + +properties: + compatible: + - const: mediatek,mt8195-vdo1-rdma + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + power-domains: + maxItems: 1 + + clocks: + items: + - description: RDMA Clock + + iommus: + maxItems: 1 + + mediatek,gce-client-reg: + description: + The register of display function block to be set by gce. There are 4 arguments, + such as gce node, subsys id, offset and register size. The subsys id that is + mapping to the register of display function blocks is defined in the gce header + include/dt-bindings/gce/<chip>-gce.h of each chips. + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + items: + - description: phandle of GCE + - description: GCE subsys id + - description: register offset + - description: register size + maxItems: 1 + +required: + - compatible + - reg + - power-domains + - clocks + - iommus + - mediatek,gce-client-reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/mt8195-clk.h> + #include <dt-bindings/power/mt8195-power.h> + #include <dt-bindings/gce/mt8195-gce.h> + #include <dt-bindings/memory/mt8195-memory-port.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + rdma@1c104000 { + compatible = "mediatek,mt8195-vdo1-rdma"; + reg = <0 0x1c104000 0 0x1000>; + interrupts = <GIC_SPI 495 IRQ_TYPE_LEVEL_HIGH 0>; + clocks = <&vdosys1 CLK_VDO1_MDP_RDMA0>; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + iommus = <&iommu_vdo M4U_PORT_L2_MDP_RDMA0>; + mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0x4000 0x1000>; + }; + };
Signature · 1 line
2.18.0
PATCH v22 2/24 dt-bindings: reset: mt8195: add vdosys1 reset control bit
In reply to Nancy.LinAdd vdosys1 reset control bit for MT8195 platform.
--- include/dt-bindings/reset/mt8195-resets.h | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+)
include/dt-bindings/reset/mt8195-resets.h +45 -0
@@ -26,4 +26,49 @@#define MT8195_TOPRGU_SW_RST_NUM 16 +/* VDOSYS1 */ +#define MT8195_VDOSYS1_SW0_RST_B_SMI_LARB2 0 +#define MT8195_VDOSYS1_SW0_RST_B_SMI_LARB3 1 +#define MT8195_VDOSYS1_SW0_RST_B_GALS 2 +#define MT8195_VDOSYS1_SW0_RST_B_FAKE_ENG0 3 +#define MT8195_VDOSYS1_SW0_RST_B_FAKE_ENG1 4 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA0 5 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA1 6 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA2 7 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA3 8 +#define MT8195_VDOSYS1_SW0_RST_B_VPP_MERGE0 9 +#define MT8195_VDOSYS1_SW0_RST_B_VPP_MERGE1 10 +#define MT8195_VDOSYS1_SW0_RST_B_VPP_MERGE2 11 +#define MT8195_VDOSYS1_SW0_RST_B_VPP_MERGE3 12 +#define MT8195_VDOSYS1_SW0_RST_B_VPP_MERGE4 13 +#define MT8195_VDOSYS1_SW0_RST_B_VPP2_TO_VDO1_DL_ASYNC 14 +#define MT8195_VDOSYS1_SW0_RST_B_VPP3_TO_VDO1_DL_ASYNC 15 +#define MT8195_VDOSYS1_SW0_RST_B_DISP_MUTEX 16 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA4 17 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA5 18 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA6 19 +#define MT8195_VDOSYS1_SW0_RST_B_MDP_RDMA7 20 +#define MT8195_VDOSYS1_SW0_RST_B_DP_INTF0 21 +#define MT8195_VDOSYS1_SW0_RST_B_DPI0 22 +#define MT8195_VDOSYS1_SW0_RST_B_DPI1 23 +#define MT8195_VDOSYS1_SW0_RST_B_DISP_MONITOR 24 +#define MT8195_VDOSYS1_SW0_RST_B_MERGE0_DL_ASYNC 25 +#define MT8195_VDOSYS1_SW0_RST_B_MERGE1_DL_ASYNC 26 +#define MT8195_VDOSYS1_SW0_RST_B_MERGE2_DL_ASYNC 27 +#define MT8195_VDOSYS1_SW0_RST_B_MERGE3_DL_ASYNC 28 +#define MT8195_VDOSYS1_SW0_RST_B_MERGE4_DL_ASYNC 29 +#define MT8195_VDOSYS1_SW0_RST_B_VDO0_DSC_TO_VDO1_DL_ASYNC 30 +#define MT8195_VDOSYS1_SW0_RST_B_VDO0_MERGE_TO_VDO1_DL_ASYNC 31 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE0 32 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE0 33 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_BE 34 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE1 48 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE1 49 +#define MT8195_VDOSYS1_SW1_RST_B_DISP_MIXER 50 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE0_DL_ASYNC 51 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE1_DL_ASYNC 52 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE0_DL_ASYNC 53 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE1_DL_ASYNC 54 +#define MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_BE_DL_ASYNC 55 +#endif /* _DT_BINDINGS_RESET_CONTROLLER_MT8195 */
Signature · 1 line
2.18.0
PATCH v22 3/24 dt-bindings: mediatek: add ethdr definition for mt8195
In reply to Nancy.LinAdd vdosys1 ETHDR definition.
--- .../display/mediatek/mediatek,ethdr.yaml | 188 ++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml
Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml new file +188 -0
@@ -0,0 +1,188 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/mediatek/mediatek,ethdr.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek Ethdr Device + +maintainers: + - Chun-Kuang Hu <[email protected]> + - Philipp Zabel <[email protected]> + +description: + ETHDR (ET High Dynamic Range) is a MediaTek internal HDR engine and is + designed for HDR video and graphics conversion in the external display path. + It handles multiple HDR input types and performs tone mapping, color + space/color format conversion, and then combine different layers, + output the required HDR or SDR signal to the subsequent display path. + This engine is composed of two video frontends, two graphic frontends, + one video backend and a mixer. ETHDR has two DMA function blocks, DS and ADL. + These two function blocks read the pre-programmed registers from DRAM and + set them to HW in the v-blanking period. + +properties: + compatible: + - const: mediatek,mt8195-disp-ethdr + + reg: + maxItems: 7 + + reg-names: + items: + - const: mixer + - const: vdo_fe0 + - const: vdo_fe1 + - const: gfx_fe0 + - const: gfx_fe1 + - const: vdo_be + - const: adl_ds + + interrupts: + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 2 + + clocks: + items: + - description: mixer clock + - description: video frontend 0 clock + - description: video frontend 1 clock + - description: graphic frontend 0 clock + - description: graphic frontend 1 clock + - description: video backend clock + - description: autodownload and menuload clock + - description: video frontend 0 async clock + - description: video frontend 1 async clock + - description: graphic frontend 0 async clock + - description: graphic frontend 1 async clock + - description: video backend async clock + - description: ethdr top clock + + clock-names: + items: + - const: mixer + - const: vdo_fe0 + - const: vdo_fe1 + - const: gfx_fe0 + - const: gfx_fe1 + - const: vdo_be + - const: adl_ds + - const: vdo_fe0_async + - const: vdo_fe1_async + - const: gfx_fe0_async + - const: gfx_fe1_async + - const: vdo_be_async + - const: ethdr_top + + power-domains: + maxItems: 1 + + resets: + items: + - description: video frontend 0 async reset + - description: video frontend 1 async reset + - description: graphic frontend 0 async reset + - description: graphic frontend 1 async reset + - description: video backend async reset + + reset-names: + items: + - const: vdo_fe0_async + - const: vdo_fe1_async + - const: gfx_fe0_async + - const: gfx_fe1_async + - const: vdo_be_async + + mediatek,gce-client-reg: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: The register of display function block to be set by gce. + There are 4 arguments in this property, gce node, subsys id, offset and + register size. The subsys id is defined in the gce header of each chips + include/dt-bindings/gce/<chip>-gce.h, mapping to the register of display + function block. + items: + items: + - description: phandle of GCE + - description: GCE subsys id + - description: register offset + - description: register size + minItems: 7 + maxItems: 7 + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + - power-domains + - resets + - mediatek,gce-client-reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/mt8195-clk.h> + #include <dt-bindings/gce/mt8195-gce.h> + #include <dt-bindings/memory/mt8195-memory-port.h> + #include <dt-bindings/power/mt8195-power.h> + #include <dt-bindings/reset/mt8195-resets.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + hdr-engine@1c114000 { + compatible = "mediatek,mt8195-disp-ethdr"; + reg = <0 0x1c114000 0 0x1000>, + <0 0x1c115000 0 0x1000>, + <0 0x1c117000 0 0x1000>, + <0 0x1c119000 0 0x1000>, + <0 0x1c11a000 0 0x1000>, + <0 0x1c11b000 0 0x1000>, + <0 0x1c11c000 0 0x1000>; + reg-names = "mixer", "vdo_fe0", "vdo_fe1", "gfx_fe0", "gfx_fe1", + "vdo_be", "adl_ds"; + mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x4000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0x5000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0x7000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0x9000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0xa000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0xb000 0x1000>, + <&gce0 SUBSYS_1c11XXXX 0xc000 0x1000>; + clocks = <&vdosys1 CLK_VDO1_DISP_MIXER>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE0>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE1>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE0>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE1>, + <&vdosys1 CLK_VDO1_HDR_VDO_BE>, + <&vdosys1 CLK_VDO1_26M_SLOW>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE0_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_VDO_FE1_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE0_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_GFX_FE1_DL_ASYNC>, + <&vdosys1 CLK_VDO1_HDR_VDO_BE_DL_ASYNC>, + <&topckgen CLK_TOP_ETHDR>; + clock-names = "mixer", "vdo_fe0", "vdo_fe1", "gfx_fe0", "gfx_fe1", + "vdo_be", "adl_ds", "vdo_fe0_async", "vdo_fe1_async", + "gfx_fe0_async", "gfx_fe1_async","vdo_be_async", + "ethdr_top"; + power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>; + iommus = <&iommu_vpp M4U_PORT_L3_HDR_DS>, + <&iommu_vpp M4U_PORT_L3_HDR_ADL>; + interrupts = <GIC_SPI 517 IRQ_TYPE_LEVEL_HIGH 0>; /* disp mixer */ + resets = <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE0_DL_ASYNC>, + <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_FE1_DL_ASYNC>, + <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE0_DL_ASYNC>, + <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_GFX_FE1_DL_ASYNC>, + <&vdosys1 MT8195_VDOSYS1_SW1_RST_B_HDR_VDO_BE_DL_ASYNC>; + reset-names = "vdo_fe0_async", "vdo_fe1_async", "gfx_fe0_async", + "gfx_fe1_async", "vdo_be_async"; + }; + }; +...
Signature · 1 line
2.18.0
PATCH v22 4/24 soc: mediatek: add mtk-mmsys ethdr and mdp_rdma components
In reply to Nancy.LinAdd new mmsys component: ethdr_mixer and mdp_rdma. These components will use in mt8195 vdosys1.
--- include/linux/soc/mediatek/mtk-mmsys.h | 9 +++++++++ 1 file changed, 9 insertions(+)
include/linux/soc/mediatek/mtk-mmsys.h +9 -0
@@ -28,7 +28,16 @@ enum mtk_ddp_comp_id {DDP_COMPONENT_DSI1 ,DDP_COMPONENT_DSI2 ,DDP_COMPONENT_DSI3 , +DDP_COMPONENT_ETHDR_MIXER ,DDP_COMPONENT_GAMMA , +DDP_COMPONENT_MDP_RDMA0 , +DDP_COMPONENT_MDP_RDMA1 , +DDP_COMPONENT_MDP_RDMA2 , +DDP_COMPONENT_MDP_RDMA3 , +DDP_COMPONENT_MDP_RDMA4 , +DDP_COMPONENT_MDP_RDMA5 , +DDP_COMPONENT_MDP_RDMA6 , +DDP_COMPONENT_MDP_RDMA7 ,DDP_COMPONENT_MERGE0 ,DDP_COMPONENT_MERGE1 , DDP_COMPONENT_MERGE2,
Signature · 1 line
2.18.0
Re: [PATCH v22 04/24] soc: mediatek: add mtk-mmsys ethdr and mdp_rdma components
Quoted 11 lines · Nancy.Lin
Add new mmsys component:
ethdr_mixerandmdp_rdma. These components will
use in mt8195 vdosys1.Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 5/24 soc: mediatek: add mtk-mmsys support for mt8195 vdosys1
In reply to Nancy.LinAdd mt8195 vdosys1 routing table to the driver data of mtk-mmsys.
--- drivers/soc/mediatek/mt8195-mmsys.h | 139 ++++++++++++++++++++++++++++ drivers/soc/mediatek/mtk-mmsys.c | 2 + 2 files changed, 141 insertions(+)
drivers/soc/mediatek/mt8195-mmsys.h +139 -0
@@ -75,6 +75,70 @@#define MT8195_SOUT_DSC_WRAP1_OUT_TO_SINA_VIRTUAL0 (2 << 16)#define MT8195_SOUT_DSC_WRAP1_OUT_TO_VPP_MERGE (3 << 16) +#define MT8195_VDO1_VPP_MERGE0_P0_SEL_IN 0xf04 +#define MT8195_VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA0 1 + +#define MT8195_VDO1_VPP_MERGE0_P1_SEL_IN 0xf08 +#define MT8195_VPP_MERGE0_P1_SEL_IN_FROM_MDP_RDMA1 1 + +#define MT8195_VDO1_DISP_DPI1_SEL_IN 0xf10 +#define MT8195_DISP_DPI1_SEL_IN_FROM_VPP_MERGE4_MOUT 0 + +#define MT8195_VDO1_DISP_DP_INTF0_SEL_IN 0xf14 +#define MT8195_DISP_DP_INTF0_SEL_IN_FROM_VPP_MERGE4_MOUT 0 + +#define MT8195_VDO1_MERGE4_SOUT_SEL 0xf18 +#define MT8195_MERGE4_SOUT_TO_DPI1_SEL 2 +#define MT8195_MERGE4_SOUT_TO_DP_INTF0_SEL 3 + +#define MT8195_VDO1_MIXER_IN1_SEL_IN 0xf24 +#define MT8195_MIXER_IN1_SEL_IN_FROM_MERGE0_ASYNC_SOUT 1 + +#define MT8195_VDO1_MIXER_IN2_SEL_IN 0xf28 +#define MT8195_MIXER_IN2_SEL_IN_FROM_MERGE1_ASYNC_SOUT 1 + +#define MT8195_VDO1_MIXER_IN3_SEL_IN 0xf2c +#define MT8195_MIXER_IN3_SEL_IN_FROM_MERGE2_ASYNC_SOUT 1 + +#define MT8195_VDO1_MIXER_IN4_SEL_IN 0xf30 +#define MT8195_MIXER_IN4_SEL_IN_FROM_MERGE3_ASYNC_SOUT 1 + +#define MT8195_VDO1_MIXER_OUT_SOUT_SEL 0xf34 +#define MT8195_MIXER_SOUT_TO_MERGE4_ASYNC_SEL 1 + +#define MT8195_VDO1_VPP_MERGE1_P0_SEL_IN 0xf3c +#define MT8195_VPP_MERGE1_P0_SEL_IN_FROM_MDP_RDMA2 1 + +#define MT8195_VDO1_MERGE0_ASYNC_SOUT_SEL 0xf40 +#define MT8195_SOUT_TO_MIXER_IN1_SEL 1 + +#define MT8195_VDO1_MERGE1_ASYNC_SOUT_SEL 0xf44 +#define MT8195_SOUT_TO_MIXER_IN2_SEL 1 + +#define MT8195_VDO1_MERGE2_ASYNC_SOUT_SEL 0xf48 +#define MT8195_SOUT_TO_MIXER_IN3_SEL 1 + +#define MT8195_VDO1_MERGE3_ASYNC_SOUT_SEL 0xf4c +#define MT8195_SOUT_TO_MIXER_IN4_SEL 1 + +#define MT8195_VDO1_MERGE4_ASYNC_SEL_IN 0xf50 +#define MT8195_MERGE4_ASYNC_SEL_IN_FROM_MIXER_OUT_SOUT 1 + +#define MT8195_VDO1_MIXER_IN1_SOUT_SEL 0xf58 +#define MT8195_MIXER_IN1_SOUT_TO_DISP_MIXER 0 + +#define MT8195_VDO1_MIXER_IN2_SOUT_SEL 0xf5c +#define MT8195_MIXER_IN2_SOUT_TO_DISP_MIXER 0 + +#define MT8195_VDO1_MIXER_IN3_SOUT_SEL 0xf60 +#define MT8195_MIXER_IN3_SOUT_TO_DISP_MIXER 0 + +#define MT8195_VDO1_MIXER_IN4_SOUT_SEL 0xf64 +#define MT8195_MIXER_IN4_SOUT_TO_DISP_MIXER 0 + +#define MT8195_VDO1_MIXER_SOUT_SEL_IN 0xf68 +#define MT8195_MIXER_SOUT_SEL_IN_FROM_DISP_MIXER 0 +static const struct mtk_mmsys_routes mmsys_mt8195_routing_table[] = { {DDP_COMPONENT_OVL0 ,DDP_COMPONENT_RDMA0 ,
@@ -367,4 +431,79 @@ static const struct mtk_mmsys_routes mmsys_mt8195_routing_table[] = { } }; +static const struct mtk_mmsys_routes mmsys_mt8195_vdo1_routing_table[] = { + { +DDP_COMPONENT_MDP_RDMA0 ,DDP_COMPONENT_MERGE1 , +MT8195_VDO1_VPP_MERGE0_P0_SEL_IN ,GENMASK (0 ,0 ), +MT8195_VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA0 + }, { +DDP_COMPONENT_MDP_RDMA1 ,DDP_COMPONENT_MERGE1 , +MT8195_VDO1_VPP_MERGE0_P1_SEL_IN ,GENMASK (0 ,0 ), +MT8195_VPP_MERGE0_P1_SEL_IN_FROM_MDP_RDMA1 + }, { +DDP_COMPONENT_MDP_RDMA2 ,DDP_COMPONENT_MERGE2 , +MT8195_VDO1_VPP_MERGE1_P0_SEL_IN ,GENMASK (0 ,0 ), +MT8195_VPP_MERGE1_P0_SEL_IN_FROM_MDP_RDMA2 + }, { +DDP_COMPONENT_MERGE1 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MERGE0_ASYNC_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_SOUT_TO_MIXER_IN1_SEL + }, { +DDP_COMPONENT_MERGE2 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MERGE1_ASYNC_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_SOUT_TO_MIXER_IN2_SEL + }, { +DDP_COMPONENT_MERGE3 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MERGE2_ASYNC_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_SOUT_TO_MIXER_IN3_SEL + }, { +DDP_COMPONENT_MERGE4 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MERGE3_ASYNC_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_SOUT_TO_MIXER_IN4_SEL + }, { +DDP_COMPONENT_ETHDR_MIXER ,DDP_COMPONENT_MERGE5 , +MT8195_VDO1_MIXER_OUT_SOUT_SEL ,GENMASK (0 ,0 ), +MT8195_MIXER_SOUT_TO_MERGE4_ASYNC_SEL + }, { +DDP_COMPONENT_MERGE1 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MIXER_IN1_SEL_IN ,GENMASK (0 ,0 ), +MT8195_MIXER_IN1_SEL_IN_FROM_MERGE0_ASYNC_SOUT + }, { +DDP_COMPONENT_MERGE2 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MIXER_IN2_SEL_IN ,GENMASK (0 ,0 ), +MT8195_MIXER_IN2_SEL_IN_FROM_MERGE1_ASYNC_SOUT + }, { +DDP_COMPONENT_MERGE3 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MIXER_IN3_SEL_IN ,GENMASK (0 ,0 ), +MT8195_MIXER_IN3_SEL_IN_FROM_MERGE2_ASYNC_SOUT + }, { +DDP_COMPONENT_MERGE4 ,DDP_COMPONENT_ETHDR_MIXER , +MT8195_VDO1_MIXER_IN4_SEL_IN ,GENMASK (0 ,0 ), +MT8195_MIXER_IN4_SEL_IN_FROM_MERGE3_ASYNC_SOUT + }, { +DDP_COMPONENT_ETHDR_MIXER ,DDP_COMPONENT_MERGE5 , +MT8195_VDO1_MIXER_SOUT_SEL_IN ,GENMASK (2 ,0 ), +MT8195_MIXER_SOUT_SEL_IN_FROM_DISP_MIXER + }, { +DDP_COMPONENT_ETHDR_MIXER ,DDP_COMPONENT_MERGE5 , +MT8195_VDO1_MERGE4_ASYNC_SEL_IN ,GENMASK (2 ,0 ), +MT8195_MERGE4_ASYNC_SEL_IN_FROM_MIXER_OUT_SOUT + }, { +DDP_COMPONENT_MERGE5 ,DDP_COMPONENT_DPI1 , +MT8195_VDO1_DISP_DPI1_SEL_IN ,GENMASK (1 ,0 ), +MT8195_DISP_DPI1_SEL_IN_FROM_VPP_MERGE4_MOUT + }, { +DDP_COMPONENT_MERGE5 ,DDP_COMPONENT_DPI1 , +MT8195_VDO1_MERGE4_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_MERGE4_SOUT_TO_DPI1_SEL + }, { +DDP_COMPONENT_MERGE5 ,DDP_COMPONENT_DP_INTF1 , +MT8195_VDO1_DISP_DP_INTF0_SEL_IN ,GENMASK (1 ,0 ), +MT8195_DISP_DP_INTF0_SEL_IN_FROM_VPP_MERGE4_MOUT + }, { +DDP_COMPONENT_MERGE5 ,DDP_COMPONENT_DP_INTF1 , +MT8195_VDO1_MERGE4_SOUT_SEL ,GENMASK (1 ,0 ), +MT8195_MERGE4_SOUT_TO_DP_INTF0_SEL + } +};#endif /* __SOC_MEDIATEK_MT8195_MMSYS_H */
drivers/soc/mediatek/mtk-mmsys.c +2 -0
@@ -147,6 +147,8 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = {static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { .io_start =0x1c100000 , .clk_driver ="clk-mt8195-vdo1" , + .routes = mmsys_mt8195_vdo1_routing_table, + .num_routes =ARRAY_SIZE (mmsys_mt8195_vdo1_routing_table), };static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = {
Signature · 1 line
2.18.0
Re: [PATCH v22 05/24] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1
Quoted 11 lines · Nancy.Lin
Add mt8195 vdosys1 routing table to the driver data of mtk-mmsys.
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by Rex-BC Chen <[email protected]>Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 6/24 soc: mediatek: add mtk_mmsys_update_bits API
In reply to Nancy.LinAdd mtk_mmsys_update_bits API. Simplify code for update mmsys reg. It is a preparation for adding support for mmsys config API.
--- drivers/soc/mediatek/mtk-mmsys.c | 36 ++++++++++++++------------------ 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/soc/mediatek/mtk-mmsys.c +16 -20
@@ -192,22 +192,27 @@ static int mtk_mmsys_find_match_drvdata(struct mtk_mmsys *mmsys,return -EINVAL ; } +static void mtk_mmsys_update_bits (struct mtk_mmsys *mmsys,u32 offset,u32 mask,u32 val) +{ +u32 tmp; + + tmp =readl_relaxed (mmsys->regs + offset); + tmp = (tmp & ~mask) | val; +writel_relaxed (tmp, mmsys->regs + offset); +} +void mtk_mmsys_ddp_connect (struct device *dev,enum mtk_ddp_comp_id cur,enum mtk_ddp_comp_id next) {struct mtk_mmsys *mmsys =dev_get_drvdata (dev);const struct mtk_mmsys_routes *routes = mmsys->data->routes; -u32 reg;int i;for (i =0 ; i < mmsys->data->num_routes; i++) -if (cur == routes[i].from_comp && next == routes[i].to_comp) { - reg =readl_relaxed (mmsys->regs + routes[i].addr); - reg &= ~routes[i].mask; - reg |= routes[i].val; -writel_relaxed (reg, mmsys->regs + routes[i].addr); - } +if (cur == routes[i].from_comp && next == routes[i].to_comp) +mtk_mmsys_update_bits (mmsys, routes[i].addr, routes[i].mask, + routes[i].val); }EXPORT_SYMBOL_GPL (mtk_mmsys_ddp_connect);
@@ -217,15 +222,11 @@ void mtk_mmsys_ddp_disconnect(struct device *dev, {struct mtk_mmsys *mmsys =dev_get_drvdata (dev);const struct mtk_mmsys_routes *routes = mmsys->data->routes; -u32 reg;int i;for (i =0 ; i < mmsys->data->num_routes; i++) -if (cur == routes[i].from_comp && next == routes[i].to_comp) { - reg =readl_relaxed (mmsys->regs + routes[i].addr); - reg &= ~routes[i].mask; -writel_relaxed (reg, mmsys->regs + routes[i].addr); - } +if (cur == routes[i].from_comp && next == routes[i].to_comp) +mtk_mmsys_update_bits (mmsys, routes[i].addr, routes[i].mask,0 ); }EXPORT_SYMBOL_GPL (mtk_mmsys_ddp_disconnect);
@@ -234,18 +235,13 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l { struct mtk_mmsys *mmsys = container_of(rcdev, struct mtk_mmsys, rcdev);unsigned long flags; -u32 reg;spin_lock_irqsave (&mmsys->lock, flags); - reg =readl_relaxed (mmsys->regs + mmsys->data->sw0_rst_offset); -if (assert) - reg &= ~BIT (id); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),0 );else - reg |=BIT (id); - -writel_relaxed (reg, mmsys->regs + mmsys->data->sw0_rst_offset); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),BIT (id));spin_unlock_irqrestore (&mmsys->lock, flags);
Signature · 1 line
2.18.0
Re: [PATCH v22 06/24] soc: mediatek: add mtk_mmsys_update_bits API
Quoted 9 lines · Nancy.Lin
Add
mtk_mmsys_update_bitsAPI. Simplify code for update mmsys reg. It is a preparation for adding support for mmsys config API.Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 7/24 soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1
In reply to Nancy.LinAdd four mmsys config APIs. The config APIs are used for config mmsys reg. Some mmsys regs need to be set according to the HW engine binding to the mmsys simultaneously.
1. mtk_mmsys_merge_async_config: config merge async width/height. async is used for cross-clock domain synchronization.
2. mtk_mmsys_hdr_confing: config hdr backend async width/height.
3. mtk_mmsys_mixer_in_config and mtk_mmsys_mixer_in_config:
config mixer related settings.
--- drivers/soc/mediatek/mt8195-mmsys.h | 6 +++++ drivers/soc/mediatek/mtk-mmsys.c | 35 ++++++++++++++++++++++++++ include/linux/soc/mediatek/mtk-mmsys.h | 9 +++++++ 3 files changed, 50 insertions(+)
drivers/soc/mediatek/mt8195-mmsys.h +6 -0
@@ -75,6 +75,12 @@#define MT8195_SOUT_DSC_WRAP1_OUT_TO_SINA_VIRTUAL0 (2 << 16)#define MT8195_SOUT_DSC_WRAP1_OUT_TO_VPP_MERGE (3 << 16) +#define MT8195_VDO1_MERGE0_ASYNC_CFG_WD 0xe30 +#define MT8195_VDO1_HDRBE_ASYNC_CFG_WD 0xe70 +#define MT8195_VDO1_HDR_TOP_CFG 0xd00 +#define MT8195_VDO1_MIXER_IN1_ALPHA 0xd30 +#define MT8195_VDO1_MIXER_IN1_PAD 0xd40 +#define MT8195_VDO1_VPP_MERGE0_P0_SEL_IN 0xf04#define MT8195_VPP_MERGE0_P0_SEL_IN_FROM_MDP_RDMA0 1
drivers/soc/mediatek/mtk-mmsys.c +35 -0
@@ -230,6 +230,41 @@ void mtk_mmsys_ddp_disconnect(struct device *dev, }EXPORT_SYMBOL_GPL (mtk_mmsys_ddp_disconnect); +void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width,int height) +{ +mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_MERGE0_ASYNC_CFG_WD +0x10 * idx, + ~0 , height <<16 | width); +} +EXPORT_SYMBOL_GPL (mtk_mmsys_merge_async_config); + +void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height) +{ +mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_HDRBE_ASYNC_CFG_WD , ~0 , + be_height <<16 | be_width); +} +EXPORT_SYMBOL_GPL (mtk_mmsys_hdr_confing); + +void mtk_mmsys_mixer_in_config (struct device *dev,int idx,bool alpha_sel,u16 alpha, +u8 mode,u32 biwidth) +{ +struct mtk_mmsys *mmsys =dev_get_drvdata (dev); + +mtk_mmsys_update_bits (mmsys,MT8195_VDO1_MIXER_IN1_ALPHA + (idx -1 ) *4 , ~0 , + alpha <<16 | alpha); +mtk_mmsys_update_bits (mmsys,MT8195_VDO1_HDR_TOP_CFG ,BIT (19 + idx), + alpha_sel << (19 + idx)); +mtk_mmsys_update_bits (mmsys,MT8195_VDO1_MIXER_IN1_PAD + (idx -1 ) *4 , +GENMASK (31 ,16 ) |GENMASK (1 ,0 ), biwidth <<16 | mode); +} +EXPORT_SYMBOL_GPL (mtk_mmsys_mixer_in_config); + +void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap) +{ +mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_MIXER_IN1_PAD + (idx -1 ) *4 , +BIT (4 ), channel_swap <<4 ); +} +EXPORT_SYMBOL_GPL (mtk_mmsys_mixer_in_channel_swap); +static int mtk_mmsys_reset_update (struct reset_controller_dev *rcdev,unsigned long id,bool assert) {
include/linux/soc/mediatek/mtk-mmsys.h +9 -0
@@ -73,4 +73,13 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); +void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width,int height); + +void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height); + +void mtk_mmsys_mixer_in_config (struct device *dev,int idx,bool alpha_sel,u16 alpha, +u8 mode,u32 biwidth); + +void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap); +#endif /* __MTK_MMSYS_H */
Signature · 1 line
2.18.0
Re: [PATCH v22 07/24] soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1
Quoted 10 lines · Nancy.Lin
Add four mmsys config APIs. The config APIs are used for config mmsys reg. Some mmsys regs need to be set according to the HW engine binding to the mmsys simultaneously.
1.
mtk_mmsys_merge_async_config: config merge async width/height. async is used for cross-clock domain synchronization.
2.mtk_mmsys_hdr_confing: config hdr backend async width/height.
3.mtk_mmsys_mixer_in_configandmtk_mmsys_mixer_in_config:
config mixer related settings.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 8/24 soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195 vdosys1
In reply to Nancy.LinAdd cmdq support for mtk-mmsys config API.
The mmsys config register settings need to take effect with the other HW settings(like OVL_ADAPTOR...) at the same vblanking time.
If we use CPU to write the mmsys reg, we can't guarantee all the settings can be written in the same vblanking time.
Cmdq is used for this purpose. We prepare all the related HW settings in one cmdq packet. The first command in the packet is "wait stream done", and then following with all the HW settings. After the cmdq packet is flush to GCE HW. The GCE waits for the "stream done event" to coming and then starts flushing all the HW settings. This can guarantee all the settings flush in the same vblanking.
--- drivers/soc/mediatek/mtk-mmsys.c | 54 +++++++++++++++++++------- include/linux/soc/mediatek/mtk-mmsys.h | 15 +++++-- 2 files changed, 50 insertions(+), 19 deletions(-)
drivers/soc/mediatek/mtk-mmsys.c +39 -15
@@ -178,6 +178,7 @@ struct mtk_mmsys {spinlock_t lock;/* protects mmsys_sw_rst_b reg */ struct reset_controller_dev rcdev;phys_addr_t io_start; +struct cmdq_client_reg cmdq_base; }; static int mtk_mmsys_find_match_drvdata(struct mtk_mmsys *mmsys,
@@ -192,10 +193,24 @@ static int mtk_mmsys_find_match_drvdata(struct mtk_mmsys *mmsys,return -EINVAL ; } -static void mtk_mmsys_update_bits (struct mtk_mmsys *mmsys,u32 offset,u32 mask,u32 val) +static void mtk_mmsys_update_bits (struct mtk_mmsys *mmsys,u32 offset,u32 mask,u32 val, +struct cmdq_pkt *cmdq_pkt) {u32 tmp; +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) +if (cmdq_pkt) { +if (mmsys->cmdq_base.size ==0 ) { +pr_err ("mmsys lose gce property, failed to update mmsys bits with cmdq" ); +return ; + } +cmdq_pkt_write_mask (cmdq_pkt, mmsys->cmdq_base.subsys, + mmsys->cmdq_base.offset + offset, val, + mask); +return ; + } +#endif + tmp =readl_relaxed (mmsys->regs + offset); tmp = (tmp & ~mask) | val;writel_relaxed (tmp, mmsys->regs + offset);
@@ -212,7 +227,7 @@ void mtk_mmsys_ddp_connect(struct device *dev,for (i =0 ; i < mmsys->data->num_routes; i++)if (cur == routes[i].from_comp && next == routes[i].to_comp)mtk_mmsys_update_bits (mmsys, routes[i].addr, routes[i].mask, - routes[i].val); + routes[i].val,NULL ); }EXPORT_SYMBOL_GPL (mtk_mmsys_ddp_connect);
@@ -226,42 +241,45 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,for (i =0 ; i < mmsys->data->num_routes; i++)if (cur == routes[i].from_comp && next == routes[i].to_comp) -mtk_mmsys_update_bits (mmsys, routes[i].addr, routes[i].mask,0 ); +mtk_mmsys_update_bits (mmsys, routes[i].addr, routes[i].mask,0 ,NULL ); }EXPORT_SYMBOL_GPL (mtk_mmsys_ddp_disconnect); -void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width,int height) +void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width,int height, +struct cmdq_pkt *cmdq_pkt) {mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_MERGE0_ASYNC_CFG_WD +0x10 * idx, - ~0 , height <<16 | width); + ~0 , height <<16 | width, cmdq_pkt); }EXPORT_SYMBOL_GPL (mtk_mmsys_merge_async_config); -void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height) +void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height, +struct cmdq_pkt *cmdq_pkt) {mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_HDRBE_ASYNC_CFG_WD , ~0 , - be_height <<16 | be_width); + be_height <<16 | be_width, cmdq_pkt); }EXPORT_SYMBOL_GPL (mtk_mmsys_hdr_confing);void mtk_mmsys_mixer_in_config (struct device *dev,int idx,bool alpha_sel,u16 alpha, -u8 mode,u32 biwidth) +u8 mode,u32 biwidth,struct cmdq_pkt *cmdq_pkt) {struct mtk_mmsys *mmsys =dev_get_drvdata (dev);mtk_mmsys_update_bits (mmsys,MT8195_VDO1_MIXER_IN1_ALPHA + (idx -1 ) *4 , ~0 , - alpha <<16 | alpha); + alpha <<16 | alpha, cmdq_pkt);mtk_mmsys_update_bits (mmsys,MT8195_VDO1_HDR_TOP_CFG ,BIT (19 + idx), - alpha_sel << (19 + idx)); + alpha_sel << (19 + idx), cmdq_pkt);mtk_mmsys_update_bits (mmsys,MT8195_VDO1_MIXER_IN1_PAD + (idx -1 ) *4 , -GENMASK (31 ,16 ) |GENMASK (1 ,0 ), biwidth <<16 | mode); +GENMASK (31 ,16 ) |GENMASK (1 ,0 ), biwidth <<16 | mode, cmdq_pkt); }EXPORT_SYMBOL_GPL (mtk_mmsys_mixer_in_config); -void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap) +void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap, +struct cmdq_pkt *cmdq_pkt) {mtk_mmsys_update_bits (dev_get_drvdata (dev),MT8195_VDO1_MIXER_IN1_PAD + (idx -1 ) *4 , -BIT (4 ), channel_swap <<4 ); +BIT (4 ), channel_swap <<4 , cmdq_pkt); }EXPORT_SYMBOL_GPL (mtk_mmsys_mixer_in_channel_swap);
@@ -274,9 +292,9 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned lspin_lock_irqsave (&mmsys->lock, flags);if (assert) -mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),0 ); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),0 ,NULL );else -mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),BIT (id)); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),BIT (id),NULL );spin_unlock_irqrestore (&mmsys->lock, flags);
@@ -366,6 +384,12 @@ static int mtk_mmsys_probe(struct platform_device *pdev) mmsys->data = match_data->drv_data[0 ]; } +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) + ret =cmdq_dev_get_client_reg (dev, &mmsys->cmdq_base,0 ); +if (ret) +dev_dbg (dev,"No mediatek,gce-client-reg!\n" ); +#endif +platform_set_drvdata (pdev, mmsys); clks = platform_device_register_data(&pdev->dev, mmsys->data->clk_driver,
include/linux/soc/mediatek/mtk-mmsys.h +11 -4
@@ -6,6 +6,10 @@#ifndef __MTK_MMSYS_H#define __MTK_MMSYS_H +#include <linux/mailbox_controller.h> +#include <linux/mailbox/mtk-cmdq-mailbox.h> +#include <linux/soc/mediatek/mtk-cmdq.h> +enum mtk_ddp_comp_id ;struct device ;
@@ -73,13 +77,16 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,enum mtk_ddp_comp_id cur, enum mtk_ddp_comp_id next); -void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width,int height); +void mtk_mmsys_merge_async_config (struct device *dev,int idx,int width, +int height,struct cmdq_pkt *cmdq_pkt); -void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height); +void mtk_mmsys_hdr_confing (struct device *dev,int be_width,int be_height, +struct cmdq_pkt *cmdq_pkt);void mtk_mmsys_mixer_in_config (struct device *dev,int idx,bool alpha_sel,u16 alpha, -u8 mode,u32 biwidth); +u8 mode,u32 biwidth,struct cmdq_pkt *cmdq_pkt); -void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap); +void mtk_mmsys_mixer_in_channel_swap (struct device *dev,int idx,bool channel_swap, +struct cmdq_pkt *cmdq_pkt);#endif /* __MTK_MMSYS_H */
Signature · 1 line
2.18.0
Re: [PATCH v22 08/24] soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195 vdosys1
Quoted 14 lines · Nancy.Lin
Add cmdq support for mtk-mmsys config API.
The mmsys config register settings need to take effect with the other HWsettings(like OVL_ADAPTOR...)at the same vblanking time.If we use CPU to write the mmsys reg, we can't guarantee all the settings can be written in the same vblanking time.
Cmdq is used for this purpose. We prepare all the related HW settings in one cmdq packet. The first command in the packet is "wait stream done",
and then following with all the HW settings. After the cmdq packet is flush to GCE HW. The GCE waits for the "stream done event" to coming and then starts flushing all the HW settings. This can guarantee all the settings flush in the same vblanking.
Quoted 7 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 9/24 soc: mediatek: mmsys: add mmsys for support 64 reset bits
In reply to Nancy.LinAdd mmsys for support 64 reset bits. It is a preparation for MT8195 vdosys1 HW reset. MT8195 vdosys1 has more than 32 reset bits.
1. Add the number of reset bits in mmsys private data
2. move the whole "reset register code section" behind the "get mmsys->data" code section for getting the num_resets in mmsys->data.
--- drivers/soc/mediatek/mtk-mmsys.c | 39 ++++++++++++++++++++------------ drivers/soc/mediatek/mtk-mmsys.h | 1 + 2 files changed, 26 insertions(+), 14 deletions(-)
drivers/soc/mediatek/mtk-mmsys.c +25 -14
@@ -20,6 +20,8 @@#include "mt8195-mmsys.h" #include "mt8365-mmsys.h" +#define MMSYS_SW_RESET_PER_REG 32 +static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .clk_driver ="clk-mt2701-mm" , .routes = mmsys_default_routing_table,
@@ -86,6 +88,7 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = { .routes = mmsys_default_routing_table, .num_routes = ARRAY_SIZE(mmsys_default_routing_table), .sw0_rst_offset = MT8183_MMSYS_SW0_RST_B, + .num_resets = 32, };static const struct mtk_mmsys_match_data mt8173_mmsys_match_data = {
@@ -100,6 +103,7 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .routes = mmsys_mt8183_routing_table, .num_routes = ARRAY_SIZE(mmsys_mt8183_routing_table), .sw0_rst_offset = MT8183_MMSYS_SW0_RST_B, + .num_resets = 32, };static const struct mtk_mmsys_match_data mt8183_mmsys_match_data = {
@@ -114,6 +118,7 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { .routes = mmsys_mt8186_routing_table, .num_routes = ARRAY_SIZE(mmsys_mt8186_routing_table), .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B, + .num_resets = 32, };static const struct mtk_mmsys_match_data mt8186_mmsys_match_data = {
@@ -288,13 +293,19 @@ static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned l { struct mtk_mmsys *mmsys = container_of(rcdev, struct mtk_mmsys, rcdev);unsigned long flags; +u32 offset; + + offset = (id /MMSYS_SW_RESET_PER_REG ) *sizeof (u32); + id = id %MMSYS_SW_RESET_PER_REG ;spin_lock_irqsave (&mmsys->lock, flags);if (assert) -mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),0 ,NULL ); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset + offset,BIT (id), +0 ,NULL );else -mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset,BIT (id),BIT (id),NULL ); +mtk_mmsys_update_bits (mmsys, mmsys->data->sw0_rst_offset + offset,BIT (id), +BIT (id),NULL );spin_unlock_irqrestore (&mmsys->lock, flags);
@@ -351,18 +362,6 @@ static int mtk_mmsys_probe(struct platform_device *pdev)return ret; } -spin_lock_init (&mmsys->lock); - - mmsys->rcdev.owner =THIS_MODULE ; - mmsys->rcdev.nr_resets =32 ; - mmsys->rcdev.ops = &mtk_mmsys_reset_ops; - mmsys->rcdev.of_node = pdev->dev.of_node; - ret =devm_reset_controller_register (&pdev->dev, &mmsys->rcdev); -if (ret) { -dev_err (&pdev->dev,"Couldn't register mmsys reset controller: %d\n" , ret); -return ret; - } - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res) {dev_err (dev,"Couldn't get mmsys resource\n" );
@@ -384,6 +383,18 @@ static int mtk_mmsys_probe(struct platform_device *pdev) mmsys->data = match_data->drv_data[0 ]; } +spin_lock_init (&mmsys->lock); + + mmsys->rcdev.owner =THIS_MODULE ; + mmsys->rcdev.nr_resets = mmsys->data->num_resets; + mmsys->rcdev.ops = &mtk_mmsys_reset_ops; + mmsys->rcdev.of_node = pdev->dev.of_node; + ret =devm_reset_controller_register (&pdev->dev, &mmsys->rcdev); +if (ret) { +dev_err (&pdev->dev,"Couldn't register mmsys reset controller: %d\n" , ret); +return ret; + } +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) ret =cmdq_dev_get_client_reg (dev, &mmsys->cmdq_base,0 );if (ret)
drivers/soc/mediatek/mtk-mmsys.h +1 -0
@@ -92,6 +92,7 @@ struct mtk_mmsys_driver_data {const struct mtk_mmsys_routes *routes;const unsigned int num_routes;const u16 sw0_rst_offset; +const u32 num_resets; };struct mtk_mmsys_match_data {
Signature · 1 line
2.18.0
Re: [PATCH v22 09/24] soc: mediatek: mmsys: add mmsys for support 64 reset bits
Quoted 6 lines · Nancy.Lin
Add mmsys for support 64 reset bits. It is a preparation for MT8195 vdosys1 HW reset. MT8195 vdosys1 has more than 32 reset bits.
1. Add the number of reset bits in mmsys private data
2. move the whole "reset register code section" behind the "getmmsys->data" code section for getting thenum_resetsin mmsys-
Quoted 7 lines
Quoted 1 line
data.
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>---
PATCH v22 10/24 soc: mediatek: mmsys: add reset control for MT8195 vdosys1
In reply to Nancy.LinMT8195 vdosys1 has more than 32 reset bits and a different reset base than other chips. Add the number of reset bits and reset base in mmsys private data.
--- drivers/soc/mediatek/mt8195-mmsys.h | 1 + drivers/soc/mediatek/mtk-mmsys.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/soc/mediatek/mt8195-mmsys.h +1 -0
@@ -75,6 +75,7 @@#define MT8195_SOUT_DSC_WRAP1_OUT_TO_SINA_VIRTUAL0 (2 << 16)#define MT8195_SOUT_DSC_WRAP1_OUT_TO_VPP_MERGE (3 << 16) +#define MT8195_VDO1_SW0_RST_B 0x1d0#define MT8195_VDO1_MERGE0_ASYNC_CFG_WD 0xe30#define MT8195_VDO1_HDRBE_ASYNC_CFG_WD 0xe70#define MT8195_VDO1_HDR_TOP_CFG 0xd00
drivers/soc/mediatek/mtk-mmsys.c +2 -0
@@ -154,6 +154,8 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { .clk_driver = "clk-mt8195-vdo1", .routes = mmsys_mt8195_vdo1_routing_table, .num_routes = ARRAY_SIZE(mmsys_mt8195_vdo1_routing_table), + .sw0_rst_offset = MT8195_VDO1_SW0_RST_B, + .num_resets = 64, };static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = {
Signature · 1 line
2.18.0
Re: [PATCH v22 10/24] soc: mediatek: mmsys: add reset control for MT8195 vdosys1
Quoted 5 lines · Nancy.Lin
MT8195 vdosys1 has more than 32 reset bits and a different reset base than other chips. Add the number of reset bits and reset base in mmsys
private data.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 11/24 soc: mediatek: add mtk-mutex component - dp_intf1
In reply to Nancy.LinAdd mtk-mutex DDP_COMPONENT_DP_INTF1 component. The MT8195 vdosys1 path component contains ovl_adaptor, merge5, and dp_intf1. It is a preparation for adding support for MT8195 vdosys1 path component.
--- drivers/soc/mediatek/mtk-mutex.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/soc/mediatek/mtk-mutex.c +4 -0
@@ -498,6 +498,9 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex,case DDP_COMPONENT_DP_INTF0 : sof_id =MUTEX_SOF_DP_INTF0 ;break ; +case DDP_COMPONENT_DP_INTF1 : + sof_id =MUTEX_SOF_DP_INTF1 ; +break ;default :if (mtx->data->mutex_mod[id] <32 ) { offset = DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg,
@@ -538,6 +541,7 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex,case DDP_COMPONENT_DPI0 :case DDP_COMPONENT_DPI1 :case DDP_COMPONENT_DP_INTF0 : +case DDP_COMPONENT_DP_INTF1 :writel_relaxed (MUTEX_SOF_SINGLE_MODE , mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg,
Signature · 1 line
2.18.0
Re: [PATCH v22 11/24] soc: mediatek: add mtk-mutex component - dp_intf1
Quoted 6 lines · Nancy.Lin
Add mtk-mutex
DDP_COMPONENT_DP_INTF1component. The MT8195 vdosys1 path
component containsovl_adaptor, merge5, anddp_intf1. It is a preparation
for adding support for MT8195 vdosys1 path component.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 12/24 soc: mediatek: add mtk-mutex support for mt8195 vdosys1
In reply to Nancy.LinAdd mtk-mutex support for mt8195 vdosys1.
The vdosys1 path component contains ovl_adaptor, merge5, and dp_intf1. Ovl_adaptor is composed of several sub-elements which include MDP_RDMA0~7, MERGE0~3, and ETHDR.
--- drivers/soc/mediatek/mtk-mutex.c | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/soc/mediatek/mtk-mutex.c +33 -0
@@ -110,6 +110,24 @@#define MT8195_MUTEX_MOD_DISP_DP_INTF0 21#define MT8195_MUTEX_MOD_DISP_PWM0 27 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA0 0 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA1 1 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA2 2 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA3 3 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA4 4 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA5 5 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA6 6 +#define MT8195_MUTEX_MOD_DISP1_MDP_RDMA7 7 +#define MT8195_MUTEX_MOD_DISP1_VPP_MERGE0 8 +#define MT8195_MUTEX_MOD_DISP1_VPP_MERGE1 9 +#define MT8195_MUTEX_MOD_DISP1_VPP_MERGE2 10 +#define MT8195_MUTEX_MOD_DISP1_VPP_MERGE3 11 +#define MT8195_MUTEX_MOD_DISP1_VPP_MERGE4 12 +#define MT8195_MUTEX_MOD_DISP1_DISP_MIXER 18 +#define MT8195_MUTEX_MOD_DISP1_DPI0 25 +#define MT8195_MUTEX_MOD_DISP1_DPI1 26 +#define MT8195_MUTEX_MOD_DISP1_DP_INTF0 27 +#define MT2712_MUTEX_MOD_DISP_PWM2 10#define MT2712_MUTEX_MOD_DISP_OVL0 11#define MT2712_MUTEX_MOD_DISP_OVL1 12
@@ -313,6 +331,21 @@ static const unsigned int mt8195_mutex_mod[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_DSI0] = MT8195_MUTEX_MOD_DISP_DSI0, [DDP_COMPONENT_PWM0] = MT8195_MUTEX_MOD_DISP_PWM0, [DDP_COMPONENT_DP_INTF0] = MT8195_MUTEX_MOD_DISP_DP_INTF0, + [DDP_COMPONENT_MDP_RDMA0] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA0, + [DDP_COMPONENT_MDP_RDMA1] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA1, + [DDP_COMPONENT_MDP_RDMA2] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA2, + [DDP_COMPONENT_MDP_RDMA3] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA3, + [DDP_COMPONENT_MDP_RDMA4] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA4, + [DDP_COMPONENT_MDP_RDMA5] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA5, + [DDP_COMPONENT_MDP_RDMA6] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA6, + [DDP_COMPONENT_MDP_RDMA7] = MT8195_MUTEX_MOD_DISP1_MDP_RDMA7, + [DDP_COMPONENT_MERGE1] = MT8195_MUTEX_MOD_DISP1_VPP_MERGE0, + [DDP_COMPONENT_MERGE2] = MT8195_MUTEX_MOD_DISP1_VPP_MERGE1, + [DDP_COMPONENT_MERGE3] = MT8195_MUTEX_MOD_DISP1_VPP_MERGE2, + [DDP_COMPONENT_MERGE4] = MT8195_MUTEX_MOD_DISP1_VPP_MERGE3, + [DDP_COMPONENT_ETHDR_MIXER] = MT8195_MUTEX_MOD_DISP1_DISP_MIXER, + [DDP_COMPONENT_MERGE5] = MT8195_MUTEX_MOD_DISP1_VPP_MERGE4, + [DDP_COMPONENT_DP_INTF1] = MT8195_MUTEX_MOD_DISP1_DP_INTF0, };static const unsigned int mt2712_mutex_sof[DDP_MUTEX_SOF_MAX ] = {
Signature · 1 line
2.18.0
Re: [PATCH v22 12/24] soc: mediatek: add mtk-mutex support for mt8195 vdosys1
Quoted 5 lines · Nancy.Lin
Add mtk-mutex support for mt8195 vdosys1.
The vdosys1 path component containsovl_adaptor, merge5, anddp_intf1.Ovl_adaptoris composed of several sub-elements which include MDP_RDMA0~7, MERGE0~3, and ETHDR.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 13/24 drm/mediatek: add display MDP RDMA support for MT8195
In reply to Nancy.LinAdd MDP_RDMA driver for MT8195. MDP_RDMA is the DMA engine of the ovl_adaptor component.
--- drivers/gpu/drm/mediatek/Makefile | 3 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 7 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 315 ++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 20 ++ 6 files changed, 346 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.h
drivers/gpu/drm/mediatek/Makefile +2 -1
@@ -13,7 +13,8 @@ mediatek-drm-y := mtk_disp_aal.o \ mtk_drm_gem.o \ mtk_drm_plane.o \ mtk_dsi.o \ - mtk_dpi.o + mtk_dpi.o \ + mtk_mdp_rdma.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
drivers/gpu/drm/mediatek/mtk_disp_drv.h +7 -0
@@ -8,6 +8,7 @@#include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_drm_plane.h" +#include "mtk_mdp_rdma.h" int mtk_aal_clk_enable (struct device *dev);void mtk_aal_clk_disable (struct device *dev);
@@ -110,4 +111,10 @@ void mtk_rdma_unregister_vblank_cb(struct device *dev);void mtk_rdma_enable_vblank (struct device *dev);void mtk_rdma_disable_vblank (struct device *dev); +int mtk_mdp_rdma_clk_enable (struct device *dev); +void mtk_mdp_rdma_clk_disable (struct device *dev); +void mtk_mdp_rdma_start (struct device *dev,struct cmdq_pkt *cmdq_pkt); +void mtk_mdp_rdma_stop (struct device *dev,struct cmdq_pkt *cmdq_pkt); +void mtk_mdp_rdma_config (struct device *dev,struct mtk_mdp_rdma_cfg *cfg, +struct cmdq_pkt *cmdq_pkt);#endif
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -873,6 +873,7 @@ static struct platform_driver * const mtk_drm_drivers[] = { &mtk_dpi_driver, &mtk_drm_platform_driver, &mtk_dsi_driver, + &mtk_mdp_rdma_driver, };static int __init mtk_drm_init (void )
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1 -0
@@ -61,5 +61,6 @@ extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver;extern struct platform_driver mtk_dsi_driver; +extern struct platform_driver mtk_mdp_rdma_driver;#endif /* MTK_DRM_DRV_H */
drivers/gpu/drm/mediatek/mtk_mdp_rdma.c new file +315 -0
315 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_mdp_rdma.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __MTK_MDP_RDMA_H__ +#define __MTK_MDP_RDMA_H__ + +struct mtk_mdp_rdma_cfg { +unsigned int pitch; +unsigned int addr0; +unsigned int width; +unsigned int height; +unsigned int x_left; +unsigned int y_top; +int fmt; +int color_encoding; +}; + +#endif // __MTK_MDP_RDMA_H__
Signature · 1 line
2.18.0
Re: [PATCH v22 13/24] drm/mediatek: add display MDP RDMA support for MT8195
Quoted 10 lines · Nancy.Lin
Add
MDP_RDMAdriver for MT8195.MDP_RDMAis the DMA engine of theovl_adaptorcomponent.Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 14/24 drm/mediatek: add display merge advance config API for MT8195
In reply to Nancy.LinAdd merge new advance config API. The original merge API is mtk_ddp_comp_funcs function prototype. The API interface parameters cannot be modified, so add a new config API for extension. This is the preparation for ovl_adaptor merge control.
--- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 3 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 52 ++++++++++++++++++++--- 2 files changed, 48 insertions(+), 7 deletions(-)
drivers/gpu/drm/mediatek/mtk_disp_drv.h +3 -0
@@ -63,6 +63,9 @@ void mtk_merge_config(struct device *dev, unsigned int width, unsigned int bpc, struct cmdq_pkt *cmdq_pkt);void mtk_merge_start (struct device *dev);void mtk_merge_stop (struct device *dev); +void mtk_merge_advance_config (struct device *dev,unsigned int l_w,unsigned int r_w, +unsigned int h,unsigned int vrefresh,unsigned int bpc, +struct cmdq_pkt *cmdq_pkt);void mtk_ovl_bgclr_in_on (struct device *dev);void mtk_ovl_bgclr_in_off (struct device *dev);
drivers/gpu/drm/mediatek/mtk_disp_merge.c +45 -7
86 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [PATCH v22 14/24] drm/mediatek: add display merge advance config API for MT8195
Quoted 5 lines · Nancy.Lin
Add merge new advance config API. The original merge API is
mtk_ddp_comp_funcsfunction prototype. The API interface parameters cannot be modified, so add a new config API for extension. This is the preparation forovl_adaptormerge control.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 15/24 drm/mediatek: add display merge start/stop API for cmdq support
In reply to Nancy.LinAdd merge start/stop API for cmdq support. The ovl_adaptor merges are configured with each drm plane update. Need to enable/disable merge with cmdq making sure all the settings taken effect in the same vblank.
--- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/mediatek/mtk_disp_drv.h +2 -0
@@ -66,6 +66,8 @@ void mtk_merge_stop(struct device *dev);void mtk_merge_advance_config (struct device *dev,unsigned int l_w,unsigned int r_w,unsigned int h,unsigned int vrefresh,unsigned int bpc,struct cmdq_pkt *cmdq_pkt); +void mtk_merge_start_cmdq (struct device *dev,struct cmdq_pkt *cmdq_pkt); +void mtk_merge_stop_cmdq (struct device *dev,struct cmdq_pkt *cmdq_pkt);void mtk_ovl_bgclr_in_on (struct device *dev);void mtk_ovl_bgclr_in_off (struct device *dev);
drivers/gpu/drm/mediatek/mtk_disp_merge.c +15 -3
@@ -67,17 +67,29 @@ struct mtk_disp_merge { };void mtk_merge_start (struct device *dev) +{ +mtk_merge_start_cmdq (dev,NULL ); +} + +void mtk_merge_stop (struct device *dev) +{ +mtk_merge_stop_cmdq (dev,NULL ); +} + +void mtk_merge_start_cmdq (struct device *dev,struct cmdq_pkt *cmdq_pkt) {struct mtk_disp_merge *priv =dev_get_drvdata (dev); -writel (MERGE_EN , priv->regs +DISP_REG_MERGE_CTRL ); +mtk_ddp_write (cmdq_pkt,1 , &priv->cmdq_reg, priv->regs, +DISP_REG_MERGE_CTRL ); } -void mtk_merge_stop (struct device *dev) +void mtk_merge_stop_cmdq (struct device *dev,struct cmdq_pkt *cmdq_pkt) {struct mtk_disp_merge *priv =dev_get_drvdata (dev); -writel (0x0 , priv->regs +DISP_REG_MERGE_CTRL ); +mtk_ddp_write (cmdq_pkt,0 , &priv->cmdq_reg, priv->regs, +DISP_REG_MERGE_CTRL ); } static void mtk_merge_fifo_setting(struct mtk_disp_merge *priv,
Signature · 1 line
2.18.0
Re: [PATCH v22 15/24] drm/mediatek: add display merge start/stop API for cmdq support
Quoted 5 lines · Nancy.Lin
Add merge start/stop API for cmdq support. The
ovl_adaptormerges are configured with each drm plane update. Need to enable/disable merge with cmdq making sure all the settings taken effect in the same vblank.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 16/24 drm/mediatek: add display merge mute/unmute support for MT8195
In reply to Nancy.LinAdd merge mute/unmute setting for MT8195. MT8195 Vdosys1 merge1~merge4 support HW mute function.
--- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/mediatek/mtk_disp_merge.c +13 -0
@@ -58,12 +58,15 @@#define FLD_PREULTRA_TH_LOW GENMASK(15, 0)#define FLD_PREULTRA_TH_HIGH GENMASK(31, 16) +#define DISP_REG_MERGE_MUTE_0 0xf00 +struct mtk_disp_merge {void __iomem *regs;struct clk *clk;struct clk *async_clk;struct cmdq_client_reg cmdq_reg;bool fifo_en; +bool mute_support; };void mtk_merge_start (struct device *dev)
@@ -80,6 +83,10 @@ void mtk_merge_start_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt) {struct mtk_disp_merge *priv =dev_get_drvdata (dev); +if (priv->mute_support) +mtk_ddp_write (cmdq_pkt,0x0 , &priv->cmdq_reg, priv->regs, +DISP_REG_MERGE_MUTE_0 ); +mtk_ddp_write (cmdq_pkt,1 , &priv->cmdq_reg, priv->regs,DISP_REG_MERGE_CTRL ); }
@@ -88,6 +95,10 @@ void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt) {struct mtk_disp_merge *priv =dev_get_drvdata (dev); +if (priv->mute_support) +mtk_ddp_write (cmdq_pkt,0x1 , &priv->cmdq_reg, priv->regs, +DISP_REG_MERGE_MUTE_0 ); +mtk_ddp_write (cmdq_pkt,0 , &priv->cmdq_reg, priv->regs,DISP_REG_MERGE_CTRL ); }
@@ -262,6 +273,8 @@ static int mtk_disp_merge_probe(struct platform_device *pdev) priv->fifo_en =of_property_read_bool (dev->of_node,"mediatek,merge-fifo-en" ); + priv->mute_support =of_property_read_bool (dev->of_node, +"mediatek,merge-mute" );platform_set_drvdata (pdev, priv); ret =component_add (dev, &mtk_disp_merge_component_ops);
Signature · 1 line
2.18.0
Re: [PATCH v22 16/24] drm/mediatek: add display merge mute/unmute support for MT8195
Quoted 11 lines · Nancy.Lin
Add merge mute/unmute setting for MT8195. MT8195 Vdosys1 merge1~merge4 support HW mute function.
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 17/24 drm/mediatek: add display merge async reset control
In reply to Nancy.LinAdd merge async reset control in mtk_merge_stop. Async hw doesn't do self reset on each sof signal(start of frame), so need to reset the async to clear the hw status for the next merge start.
--- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/mediatek/mtk_disp_merge.c +11 -0
@@ -8,6 +8,7 @@#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/platform_device.h> +#include <linux/reset.h> #include <linux/soc/mediatek/mtk-cmdq.h> #include "mtk_drm_ddp_comp.h"
@@ -67,6 +68,7 @@ struct mtk_disp_merge {struct cmdq_client_reg cmdq_reg;bool fifo_en;bool mute_support; +struct reset_control *reset_ctl; };void mtk_merge_start (struct device *dev)
@@ -101,6 +103,9 @@ void mtk_merge_stop_cmdq(struct device *dev, struct cmdq_pkt *cmdq_pkt)mtk_ddp_write (cmdq_pkt,0 , &priv->cmdq_reg, priv->regs,DISP_REG_MERGE_CTRL ); + +if (priv->async_clk) +reset_control_reset (priv->reset_ctl); } static void mtk_merge_fifo_setting(struct mtk_disp_merge *priv,
@@ -264,6 +269,12 @@ static int mtk_disp_merge_probe(struct platform_device *pdev)return PTR_ERR (priv->async_clk); } +if (priv->async_clk) { + priv->reset_ctl =devm_reset_control_get_optional_exclusive (dev,NULL ); +if (IS_ERR (priv->reset_ctl)) +return PTR_ERR (priv->reset_ctl); + } +#if IS_REACHABLE (CONFIG_MTK_CMDQ ) ret =cmdq_dev_get_client_reg (dev, &priv->cmdq_reg,0 );if (ret)
Signature · 1 line
2.18.0
Re: [PATCH v22 17/24] drm/mediatek: add display merge async reset control
Quoted 6 lines · Nancy.Lin
Add merge async reset control in
mtk_merge_stop. Async hw doesn't do self
reset on each sof signal(start of frame), so need to reset the async to
clear the hw status for the next merge start.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by CK Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 18/24 drm/mediatek: add ETHDR support for MT8195
In reply to Nancy.LinETHDR is a part of ovl_adaptor.
ETHDR is designed for HDR video and graphics conversion in the external display path. It handles multiple HDR input types and performs tone mapping, color space/color format conversion, and then combine different layers, output the required HDR or SDR signal to the subsequent display path.
--- drivers/gpu/drm/mediatek/Makefile | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + drivers/gpu/drm/mediatek/mtk_ethdr.c | 369 +++++++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_ethdr.h | 26 ++ 5 files changed, 398 insertions(+) create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.h
drivers/gpu/drm/mediatek/Makefile +1 -0
@@ -14,6 +14,7 @@ mediatek-drm-y := mtk_disp_aal.o \ mtk_drm_plane.o \ mtk_dsi.o \ mtk_dpi.o \ + mtk_ethdr.o \ mtk_mdp_rdma.o obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -0
@@ -873,6 +873,7 @@ static struct platform_driver * const mtk_drm_drivers[] = { &mtk_dpi_driver, &mtk_drm_platform_driver, &mtk_dsi_driver, + &mtk_ethdr_driver, &mtk_mdp_rdma_driver, };
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1 -0
@@ -61,6 +61,7 @@ extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver;extern struct platform_driver mtk_dsi_driver; +extern struct platform_driver mtk_ethdr_driver;extern struct platform_driver mtk_mdp_rdma_driver;#endif /* MTK_DRM_DRV_H */
drivers/gpu/drm/mediatek/mtk_ethdr.c new file +369 -0
369 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_ethdr.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2021 MediaTek Inc. +*/ + +#ifndef __MTK_ETHDR_H__ +#define __MTK_ETHDR_H__ + +void mtk_ethdr_start (struct device *dev); +void mtk_ethdr_stop (struct device *dev); +int mtk_ethdr_clk_enable (struct device *dev); +void mtk_ethdr_clk_disable (struct device *dev); +void mtk_ethdr_config (struct device *dev,unsigned int w, +unsigned int h,unsigned int vrefresh, +unsigned int bpc,struct cmdq_pkt *cmdq_pkt); +void mtk_ethdr_layer_config (struct device *dev,unsigned int idx, +struct mtk_plane_state *state, +struct cmdq_pkt *cmdq_pkt); +void mtk_ethdr_register_vblank_cb (struct device *dev, +void (*vblank_cb)(void *), +void *vblank_cb_data); +void mtk_ethdr_unregister_vblank_cb (struct device *dev); +void mtk_ethdr_enable_vblank (struct device *dev); +void mtk_ethdr_disable_vblank (struct device *dev); +#endif +
Signature · 1 line
2.18.0
Re: [PATCH v22 18/24] drm/mediatek: add ETHDR support for MT8195
Quoted 8 lines · Nancy.Lin
ETHDR is a part of
ovl_adaptor.
ETHDR is designed for HDR video and graphics conversion in the external
display path. It handles multiple HDR input types and performs tone mapping, color space/color format conversion, and then combine different layers, output the required HDR or SDR signal to the subsequent display path.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 19/24 drm/mediatek: add mediatek-drm plane color encoding info
In reply to Nancy.LinAdd plane color encoding information for color space conversion. It's a preparation for adding support for mt8195 ovl_adaptor mdp_rdma csc control.
--- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_plane.c +1 -0
@@ -138,6 +138,7 @@ static void mtk_plane_update_new_state(struct drm_plane_state *new_state, mtk_plane_state->pending.width =drm_rect_width (&new_state->dst); mtk_plane_state->pending.height =drm_rect_height (&new_state->dst); mtk_plane_state->pending.rotation = new_state->rotation; + mtk_plane_state->pending.color_encoding = new_state->color_encoding; } static void mtk_plane_atomic_async_update(struct drm_plane *plane,
drivers/gpu/drm/mediatek/mtk_drm_plane.h +1 -0
@@ -24,6 +24,7 @@ struct mtk_plane_pending_state {bool dirty;bool async_dirty;bool async_config; +enum drm_color_encoding color_encoding; };struct mtk_plane_state {
Signature · 1 line
2.18.0
Re: [PATCH v22 19/24] drm/mediatek: add mediatek-drm plane color encoding info
Quoted 4 lines · Nancy.Lin
Add plane color encoding information for color space conversion. It's a preparation for adding support for mt8195
ovl_adaptormdp_rdmacsc control.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 20/24 drm/mediatek: add ovl_adaptor support for MT8195
In reply to Nancy.LinAdd ovl_adaptor driver for MT8195.Ovl_adaptor is an encapsulated module and designed for simplified DRM control flow. This module is composed of 8 RDMAs, 4 MERGEs and an ETHDR. Two RDMAs merge into one layer, so this module support 4 layers.
--- drivers/gpu/drm/mediatek/Makefile | 1 + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 26 + .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 514 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + 4 files changed, 542 insertions(+) create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
drivers/gpu/drm/mediatek/Makefile +1 -0
@@ -6,6 +6,7 @@ mediatek-drm-y := mtk_disp_aal.o \ mtk_disp_gamma.o \ mtk_disp_merge.o \ mtk_disp_ovl.o \ + mtk_disp_ovl_adaptor.o \ mtk_disp_rdma.o \ mtk_drm_crtc.o \ mtk_drm_ddp_comp.o \
drivers/gpu/drm/mediatek/mtk_disp_drv.h +26 -0
@@ -7,6 +7,8 @@#define _MTK_DISP_DRV_H_#include <linux/soc/mediatek/mtk-cmdq.h> +#include <linux/soc/mediatek/mtk-mmsys.h> +#include <linux/soc/mediatek/mtk-mutex.h> #include "mtk_drm_plane.h" #include "mtk_mdp_rdma.h"
@@ -116,6 +118,30 @@ void mtk_rdma_unregister_vblank_cb(struct device *dev);void mtk_rdma_enable_vblank (struct device *dev);void mtk_rdma_disable_vblank (struct device *dev); +void mtk_ovl_adaptor_add_comp (struct device *dev,struct mtk_mutex *mutex); +void mtk_ovl_adaptor_remove_comp (struct device *dev,struct mtk_mutex *mutex); +void mtk_ovl_adaptor_connect (struct device *dev,struct device *mmsys_dev, +unsigned int next); +void mtk_ovl_adaptor_disconnect (struct device *dev,struct device *mmsys_dev, +unsigned int next); +int mtk_ovl_adaptor_clk_enable (struct device *dev); +void mtk_ovl_adaptor_clk_disable (struct device *dev); +void mtk_ovl_adaptor_config (struct device *dev,unsigned int w, +unsigned int h,unsigned int vrefresh, +unsigned int bpc,struct cmdq_pkt *cmdq_pkt); +void mtk_ovl_adaptor_layer_config (struct device *dev,unsigned int idx, +struct mtk_plane_state *state, +struct cmdq_pkt *cmdq_pkt); +void mtk_ovl_adaptor_register_vblank_cb (struct device *dev,void (*vblank_cb)(void *), +void *vblank_cb_data); +void mtk_ovl_adaptor_unregister_vblank_cb (struct device *dev); +void mtk_ovl_adaptor_enable_vblank (struct device *dev); +void mtk_ovl_adaptor_disable_vblank (struct device *dev); +void mtk_ovl_adaptor_start (struct device *dev); +void mtk_ovl_adaptor_stop (struct device *dev); +unsigned int mtk_ovl_adaptor_layer_nr (struct device *dev); +struct device *mtk_ovl_adaptor_dma_dev_get (struct device *dev); +int mtk_mdp_rdma_clk_enable (struct device *dev);void mtk_mdp_rdma_clk_disable (struct device *dev);void mtk_mdp_rdma_start (struct device *dev,struct cmdq_pkt *cmdq_pkt);
drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c new file +514 -0
514 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.h +1 -0
@@ -57,6 +57,7 @@ extern struct platform_driver mtk_disp_ccorr_driver;extern struct platform_driver mtk_disp_color_driver;extern struct platform_driver mtk_disp_gamma_driver;extern struct platform_driver mtk_disp_merge_driver; +extern struct platform_driver mtk_disp_ovl_adaptor_driver;extern struct platform_driver mtk_disp_ovl_driver;extern struct platform_driver mtk_disp_rdma_driver;extern struct platform_driver mtk_dpi_driver;
Signature · 1 line
2.18.0
Re: [PATCH v22 20/24] drm/mediatek: add ovl_adaptor support for MT8195
Quoted 6 lines · Nancy.Lin
Add
ovl_adaptordriver for MT8195.Ovl_adaptoris an encapsulated module and designed for simplified DRM control flow. This module is composed of 8 RDMAs, 4 MERGEs and an ETHDR. Two RDMAs merge into one layer, so this module support 4 layers.
Quoted 7 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by Chun-Kuang Hu <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
Tested-by: AngeloGioacchino Del Regno <
[email protected]>
---
PATCH v22 21/24 drm/mediatek: add dma dev get function
In reply to Nancy.LinThis is a preparation for adding support for the ovl_adaptor sub driver Ovl_adaptor is a DRM sub driver, which doesn't have dma dev. Add dma_dev_get function for getting representative dma dev in ovl_adaptor.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 ++++++++ 3 files changed, 24 insertions(+)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +15 -0
@@ -59,6 +59,7 @@ struct mtk_drm_crtc {#endif struct device *mmsys_dev; +struct device *dma_dev;struct mtk_mutex *mutex;unsigned int ddp_comp_nr;struct mtk_ddp_comp **ddp_comp;
@@ -866,6 +867,13 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,return 0 ; } +struct device *mtk_drm_crtc_dma_dev_get (struct drm_crtc *crtc) +{ +struct mtk_drm_crtc *mtk_crtc =to_mtk_crtc (crtc); + +return mtk_crtc->dma_dev; +} +int mtk_drm_crtc_create (struct drm_device *drm_dev,const enum mtk_ddp_comp_id *path,unsigned int path_len) {
@@ -954,6 +962,13 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,return ret; } +/* +* Default to use the first component as the dma dev. +* In the case of ovl_adaptor sub driver, it needs to use the +* dma_dev_get function to get representative dma dev. +*/ + mtk_crtc->dma_dev =mtk_ddp_comp_dma_dev_get (&priv->ddp_comp[path[0 ]]); + ret =mtk_drm_crtc_init (drm_dev, mtk_crtc, pipe);if (ret <0 )return ret;
drivers/gpu/drm/mediatek/mtk_drm_crtc.h +1 -0
@@ -22,5 +22,6 @@ int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane, struct mtk_plane_state *state);void mtk_drm_crtc_async_update (struct drm_crtc *crtc,struct drm_plane *plane,struct drm_atomic_state *plane_state); +struct device *mtk_drm_crtc_dma_dev_get (struct drm_crtc *crtc);#endif /* MTK_DRM_CRTC_H */
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +8 -0
@@ -70,6 +70,7 @@ struct mtk_ddp_comp_funcs {void (*bgclr_in_off)(struct device *dev);void (*ctm_set)(struct device *dev,struct drm_crtc_state *state); +struct device * (*dma_dev_get)(struct device *dev); };struct mtk_ddp_comp {
@@ -202,6 +203,13 @@ static inline void mtk_ddp_ctm_set(struct mtk_ddp_comp *comp, comp->funcs->ctm_set (comp->dev, state); } +static inline struct device *mtk_ddp_comp_dma_dev_get (struct mtk_ddp_comp *comp) +{ +if (comp->funcs && comp->funcs->dma_dev_get) +return comp->funcs->dma_dev_get (comp->dev); +return comp->dev; +} +int mtk_ddp_comp_get_id (struct device_node *node,enum mtk_ddp_comp_type comp_type); unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
Signature · 1 line
2.18.0
Re: [PATCH v22 21/24] drm/mediatek: add dma dev get function
Quoted 6 lines · Nancy.Lin
This is a preparation for adding support for the
ovl_adaptorsub driverOvl_adaptoris a DRM sub driver, which doesn't have dma dev. Adddma_dev_getfunction for getting representative dma dev inovl_adaptor.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioachino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 22/24 drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support
In reply to Nancy.LinMT8195 have two mmsys. Modify drm for MT8195 multi-mmsys support. The two mmsys (vdosys0 and vdosys1) will bring up two drm drivers, only one drm driver register as the drm device.
Each drm driver binds its own component. The last bind drm driver allocates and registers the drm device to drm core. Each crtc path is created with the corresponding drm driver data.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 24 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 3 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 292 ++++++++++++++++++------ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 10 +- 4 files changed, 242 insertions(+), 87 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +15 -9
@@ -875,21 +875,28 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) }int mtk_drm_crtc_create (struct drm_device *drm_dev, -const enum mtk_ddp_comp_id *path,unsigned int path_len) +const enum mtk_ddp_comp_id *path,unsigned int path_len, +int priv_data_index) {struct mtk_drm_private *priv = drm_dev->dev_private;struct device *dev = drm_dev->dev;struct mtk_drm_crtc *mtk_crtc;unsigned int num_comp_planes =0 ; -int pipe = priv->num_pipes;int ret;int i;bool has_ctm = false;uint gamma_lut_size =0 ; +struct drm_crtc *tmp; +int crtc_i =0 ;if (!path)return 0 ; + priv = priv->all_drm_private[priv_data_index]; + +drm_for_each_crtc (tmp, drm_dev) + crtc_i++; +for (i =0 ; i < path_len; i++) {enum mtk_ddp_comp_id comp_id = path[i];struct device_node *node;
@@ -901,7 +908,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,if (!node) {dev_info (dev,"Not creating crtc %d because component %d is disabled or missing\n" , - pipe, comp_id); + crtc_i, comp_id);return 0 ; }
@@ -957,7 +964,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) { ret =mtk_drm_crtc_init_comp_planes (drm_dev, mtk_crtc, i, - pipe); + crtc_i);if (ret)return ret; }
@@ -969,24 +976,23 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,*/ mtk_crtc->dma_dev =mtk_ddp_comp_dma_dev_get (&priv->ddp_comp[path[0 ]]); - ret =mtk_drm_crtc_init (drm_dev, mtk_crtc, pipe); + ret =mtk_drm_crtc_init (drm_dev, mtk_crtc, crtc_i);if (ret <0 )return ret;if (gamma_lut_size)drm_mode_crtc_set_gamma_size (&mtk_crtc->base, gamma_lut_size);drm_crtc_enable_color_mgmt (&mtk_crtc->base,0 , has_ctm, gamma_lut_size); - priv->num_pipes++;mutex_init (&mtk_crtc->hw_lock);#if IS_REACHABLE (CONFIG_MTK_CMDQ ) + i = priv->mbox_index++; mtk_crtc->cmdq_client.client.dev = mtk_crtc->mmsys_dev; mtk_crtc->cmdq_client.client.tx_block = false; mtk_crtc->cmdq_client.client.knows_txdone = true; mtk_crtc->cmdq_client.client.rx_callback = ddp_cmdq_cb; mtk_crtc->cmdq_client.chan = -mbox_request_channel (&mtk_crtc->cmdq_client.client, -drm_crtc_index (&mtk_crtc->base)); +mbox_request_channel (&mtk_crtc->cmdq_client.client, i);if (IS_ERR (mtk_crtc->cmdq_client.chan)) {dev_dbg (dev,"mtk_crtc %d failed to create mailbox client, writing register by CPU now\n" ,drm_crtc_index (&mtk_crtc->base));
@@ -996,7 +1002,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,if (mtk_crtc->cmdq_client.chan) { ret =of_property_read_u32_index (priv->mutex_node,"mediatek,gce-events" , -drm_crtc_index (&mtk_crtc->base), + i, &mtk_crtc->cmdq_event);if (ret) { dev_dbg(dev, "mtk_crtc %d failed to get mediatek,gce-events property\n",
drivers/gpu/drm/mediatek/mtk_drm_crtc.h +2 -1
@@ -17,7 +17,8 @@void mtk_drm_crtc_commit (struct drm_crtc *crtc);int mtk_drm_crtc_create (struct drm_device *drm_dev,const enum mtk_ddp_comp_id *path, -unsigned int path_len); +unsigned int path_len, +int priv_data_index);int mtk_drm_crtc_plane_check (struct drm_crtc *crtc,struct drm_plane *plane,struct mtk_plane_state *state); void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,
drivers/gpu/drm/mediatek/mtk_drm_drv.c +218 -74
441 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.h +7 -3
@@ -30,6 +30,8 @@ struct mtk_mmsys_driver_data {unsigned int third_len;bool shadow_register; +unsigned int mmsys_id; +unsigned int mmsys_dev_num; };struct mtk_mmsys_match_data {
@@ -40,9 +42,9 @@ struct mtk_mmsys_match_data {struct mtk_drm_private {struct drm_device *drm;struct device *dma_dev; - -unsigned int num_pipes; - +bool mtk_drm_bound; +bool drm_master; +struct device *dev;struct device_node *mutex_node;struct device *mutex_dev;struct device *mmsys_dev;
@@ -50,6 +52,8 @@ struct mtk_drm_private {struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_ID_MAX ];const struct mtk_mmsys_driver_data *data;struct drm_atomic_state *suspend_state; +unsigned int mbox_index; +struct mtk_drm_private **all_drm_private; };extern struct platform_driver mtk_disp_aal_driver;
Signature · 1 line
2.18.0
Re: [PATCH v22 22/24] drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support
Quoted 7 lines · Nancy.Lin
MT8195 have two mmsys. Modify drm for MT8195 multi-mmsys support. The two mmsys (vdosys0 and vdosys1) will bring up two drm drivers, only one drm driver register as the drm device.
Each drm driver binds its own component. The last bind drm driver allocates and registers the drm device to drm core. Each crtc path is created with the corresponding drm driver data.
Quoted 8 lines
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 23/24 drm/mediatek: add drm ovl_adaptor sub driver for MT8195
In reply to Nancy.LinAdd drm ovl_adaptor sub driver. Bring up ovl_adaptor sub driver if the component exists in the path.
--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 61 +++++----- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 125 ++++++++++++-------- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 50 +++++++- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 78 ++++++------ drivers/gpu/drm/mediatek/mtk_drm_drv.h | 12 +- 6 files changed, 207 insertions(+), 121 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +33 -28
@@ -380,13 +380,17 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) }for (i =0 ; i < mtk_crtc->ddp_comp_nr -1 ; i++) { -mtk_mmsys_ddp_connect (mtk_crtc->mmsys_dev, - mtk_crtc->ddp_comp[i]->id, - mtk_crtc->ddp_comp[i +1 ]->id); -mtk_mutex_add_comp (mtk_crtc->mutex, - mtk_crtc->ddp_comp[i]->id); +if (!mtk_ddp_comp_connect (mtk_crtc->ddp_comp[i], mtk_crtc->mmsys_dev, + mtk_crtc->ddp_comp[i +1 ]->id)) +mtk_mmsys_ddp_connect (mtk_crtc->mmsys_dev, + mtk_crtc->ddp_comp[i]->id, + mtk_crtc->ddp_comp[i +1 ]->id); +if (!mtk_ddp_comp_add (mtk_crtc->ddp_comp[i], mtk_crtc->mutex)) +mtk_mutex_add_comp (mtk_crtc->mutex, + mtk_crtc->ddp_comp[i]->id); } -mtk_mutex_add_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); +if (!mtk_ddp_comp_add (mtk_crtc->ddp_comp[i], mtk_crtc->mutex)) +mtk_mutex_add_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);mtk_mutex_enable (mtk_crtc->mutex);for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) {
@@ -435,17 +439,22 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) }for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) -mtk_mutex_remove_comp (mtk_crtc->mutex, - mtk_crtc->ddp_comp[i]->id); +if (!mtk_ddp_comp_remove (mtk_crtc->ddp_comp[i], mtk_crtc->mutex)) +mtk_mutex_remove_comp (mtk_crtc->mutex, + mtk_crtc->ddp_comp[i]->id);mtk_mutex_disable (mtk_crtc->mutex);for (i =0 ; i < mtk_crtc->ddp_comp_nr -1 ; i++) { -mtk_mmsys_ddp_disconnect (mtk_crtc->mmsys_dev, - mtk_crtc->ddp_comp[i]->id, - mtk_crtc->ddp_comp[i +1 ]->id); -mtk_mutex_remove_comp (mtk_crtc->mutex, - mtk_crtc->ddp_comp[i]->id); +if (!mtk_ddp_comp_disconnect (mtk_crtc->ddp_comp[i], mtk_crtc->mmsys_dev, + mtk_crtc->ddp_comp[i +1 ]->id)) +mtk_mmsys_ddp_disconnect (mtk_crtc->mmsys_dev, + mtk_crtc->ddp_comp[i]->id, + mtk_crtc->ddp_comp[i +1 ]->id); +if (!mtk_ddp_comp_remove (mtk_crtc->ddp_comp[i], mtk_crtc->mutex)) +mtk_mutex_remove_comp (mtk_crtc->mutex, + mtk_crtc->ddp_comp[i]->id); } -mtk_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id); +if (!mtk_ddp_comp_remove (mtk_crtc->ddp_comp[i], mtk_crtc->mutex)) +mtk_mutex_remove_comp (mtk_crtc->mutex, mtk_crtc->ddp_comp[i]->id);mtk_crtc_ddp_clk_disable (mtk_crtc);mtk_mutex_unprepare (mtk_crtc->mutex);
@@ -875,7 +884,7 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) }int mtk_drm_crtc_create (struct drm_device *drm_dev, -const enum mtk_ddp_comp_id *path,unsigned int path_len, +const unsigned int *path,unsigned int path_len,int priv_data_index) {struct mtk_drm_private *priv = drm_dev->dev_private;
@@ -898,22 +907,18 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, crtc_i++;for (i =0 ; i < path_len; i++) { -enum mtk_ddp_comp_id comp_id = path[i]; +unsigned int comp_id = path[i];struct device_node *node; -struct mtk_ddp_comp *comp; node = priv->comp_node[comp_id]; - comp = &priv->ddp_comp[comp_id]; - -if (!node) { -dev_info (dev, -"Not creating crtc %d because component %d is disabled or missing\n" , - crtc_i, comp_id); -return 0 ; - } -if (!comp->dev) { -dev_err (dev,"Component %pOF not initialized\n" , node); +/* Not all drm components have a DTS device node, such as ovl_adaptor, +* which is the drm bring up sub driver +*/ +if (!node && comp_id !=DDP_COMPONENT_DRM_OVL_ADAPTOR ) { +dev_err (dev, +"Not creating crtc %d because component %d is disabled, missing or not initialized\n" , + crtc_i, comp_id);return -ENODEV ; } }
@@ -938,7 +943,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, }for (i =0 ; i < mtk_crtc->ddp_comp_nr; i++) { -enum mtk_ddp_comp_id comp_id = path[i]; +unsigned int comp_id = path[i];struct mtk_ddp_comp *comp; comp = &priv->ddp_comp[comp_id];
drivers/gpu/drm/mediatek/mtk_drm_crtc.h +1 -1
@@ -16,7 +16,7 @@void mtk_drm_crtc_commit (struct drm_crtc *crtc);int mtk_drm_crtc_create (struct drm_device *drm_dev, -const enum mtk_ddp_comp_id *path, +const unsigned int *path,unsigned int path_len,int priv_data_index); int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +76 -49
171 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +47 -3
84 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.c +43 -35
254 lines not on this page · raw message
drivers/gpu/drm/mediatek/mtk_drm_drv.h +7 -5
@@ -11,6 +11,8 @@#define MAX_CRTC 3#define MAX_CONNECTOR 2 +#define DDP_COMPONENT_DRM_OVL_ADAPTOR (DDP_COMPONENT_ID_MAX + 1) +#define DDP_COMPONENT_DRM_ID_MAX (DDP_COMPONENT_DRM_OVL_ADAPTOR + 1)struct device ;struct device_node ;
@@ -22,11 +24,11 @@ struct regmap;struct mtk_mmsys_driver_data {const resource_size_t io_start; -const enum mtk_ddp_comp_id *main_path; +const unsigned int *main_path;unsigned int main_len; -const enum mtk_ddp_comp_id *ext_path; +const unsigned int *ext_path;unsigned int ext_len; -const enum mtk_ddp_comp_id *third_path; +const unsigned int *third_path;unsigned int third_len;bool shadow_register;
@@ -48,8 +50,8 @@ struct mtk_drm_private {struct device_node *mutex_node;struct device *mutex_dev;struct device *mmsys_dev; -struct device_node *comp_node[DDP_COMPONENT_ID_MAX ]; -struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_ID_MAX ]; +struct device_node *comp_node[DDP_COMPONENT_DRM_ID_MAX ]; +struct mtk_ddp_comp ddp_comp[DDP_COMPONENT_DRM_ID_MAX ];const struct mtk_mmsys_driver_data *data;struct drm_atomic_state *suspend_state;unsigned int mbox_index;
Signature · 1 line
2.18.0
Re: [PATCH v22 23/24] drm/mediatek: add drm ovl_adaptor sub driver for MT8195
Quoted 11 lines · Nancy.Lin
Add drm
ovl_adaptorsub driver. Bring upovl_adaptorsub driver if the component exists in the path.Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
PATCH v22 24/24 drm/mediatek: add mediatek-drm of vdosys1 support for MT8195
In reply to Nancy.LinAdd driver data of mt8195 vdosys1 to mediatek-drm.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +12 -2
@@ -210,6 +210,12 @@ static const unsigned int mt8195_mtk_ddp_main[] = { DDP_COMPONENT_DP_INTF0, }; +static const unsigned int mt8195_mtk_ddp_ext[] = { +DDP_COMPONENT_DRM_OVL_ADAPTOR , +DDP_COMPONENT_MERGE5 , +DDP_COMPONENT_DP_INTF1 , +}; +static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .main_path = mt2701_mtk_ddp_main, .main_len =ARRAY_SIZE (mt2701_mtk_ddp_main),
@@ -336,15 +342,19 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = { .io_start = 0x1c01a000, .main_path = mt8195_mtk_ddp_main, .main_len = ARRAY_SIZE(mt8195_mtk_ddp_main), - .mmsys_dev_num = 1, + .mmsys_dev_num = 2, };static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { .io_start =0x1c100000 , + .ext_path = mt8195_mtk_ddp_ext, + .ext_len =ARRAY_SIZE (mt8195_mtk_ddp_ext), + .mmsys_id =1 , + .mmsys_dev_num =2 , };static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = { - .num_drv_data =1 , + .num_drv_data =2 , .drv_data = { &mt8195_vdosys0_driver_data, &mt8195_vdosys1_driver_data,
Signature · 1 line
2.18.0
Re: [PATCH v22 24/24] drm/mediatek: add mediatek-drm of vdosys1 support for MT8195
Quoted 10 lines · Nancy.Lin
Add driver data of mt8195 vdosys1 to mediatek-drm.
Signed-off-by Nancy.Lin <[email protected]>Reviewed-by AngeloGioacchino Del Regno <Reviewed-by CK Hu <[email protected]>Tested-by AngeloGioacchino Del Regno <
Quoted 209 lines · Nancy.Lin
The hardware path of vdosys1 with DPTx output need to go through by several modules, such as,
OVL_ADAPTORand MERGE.Add DRM and these modules support by the patches below:
Changes in v22:
- rebase to next-20220525
- rebase to vdosys0 series v22
- separate dts to a new patchChanges in v21:
- fix reviewer comment
- fix rdma and ethdr binding doc and dtsChanges in v20:
- fix reviewer comment
- update mmsys update bit api name
- addmtk_mmsys_update_bitserror message if lose gce property
- list all mt8195 vdosys1 reset bitsChanges in v19:
- fix reviewer comment
- separate mt8195 mmsys component to a new patch
- separate mt8195 vdo0 and vdo1 routing table
- separatemmsys_write_regapi to a new patch and simplify write
reg code
- separate mmsys 64 bit reset to a new patch
- separate mtk-mutexdp_intf1component to a new patchChanges in v18:
- fix reviewer comment
- fix rdma binding doc
- fix ethdr binding doc
- refine mmsys config cmdq support
- refine merge reset control flow, get reset control in probe
function
- add ethdr reset control error handling and remove dbg log
- rebase to vdosys0 series v20 (ref [5])Changes in v17:
- fix reviewer comment in v16
- separate ovl adaptor comp in mtk-mmsys and mtk-mutex
- separate mmsys config API
- movemdp_rdmabinding yaml
- fix ovl adaptor pm runtime get sync timing issue
- rebase to vdosys0 series v19 (ref [5])
- rebase to [7] for modify vblank register changeChanges in v16:
- fix reviewer comment in v 15
- fixmtk_drm_ddp_comp.calignment
- fix vdosys0 mmsys num before adding vdosys1 patchChanges in v15:
- fix ethdr uppercase hex number in dtsChanges in v14:
- removeMTK_MMSYS64 bit dependency
- addethdr.yamlback and fixdt_schemacheck failResend v13
- add related maintainer in maillistChanges in v13:
- fix reviewer comment in v12
- fix rdma dt-binding format
- fix dts node naming
- fix 32 bit build error
- modify 64bit dependency for mtk-mmsys
- rebase to vdosys0 series v16. (ref [5])Changes in v12:
- fix reviewer comment in v11
- modify mbox index
- refine dma dev forovl_adaptorsub driverChanges in v11:
- remove ethdr vblank spin lock
- refineovl_adaptorprint messageChanges in v10:
- refine ethdr reset control usingdevm_reset_control_array_get_optional_exclusive
- fixovl_adaptormtk_ovl_adaptor_clk_enableerror handle issueChanges in v9:
- rebase on kernel-5.16-rc1
- rebase on vdosys0 series v13. (ref [5])
- fixovl_adaptorsub driver is brought up unintentionally
- fix clang build test fail- duplicate ethdr/mdp_rdma init_module/cleanup_module symbol issueChanges in v8:
- separate merge async reset to new patch.
- separate drmovl_adaptorsub driver to new patch.
- fix reviewer comment in v7.Changes in v7:
- rebase on vdosys0 series v12 (ref[5])
- add dma description in ethdr binding document.
- refine vdosys1 bit definition of mmsys routing table.
- separate merge modification into 3 pathces.
- separate mutex modification into 2 patches.
- add plane color coding formdp_rdmacsc.
- movemdp_rdmapm control toovl_adaptor.
- fix reviewer comment in v6.Changes in v6:
- rebase on kernel-5.15-rc1.
- change mbox label to gce0 for dts node of vdosys1.
- modify mmsys reset num for mt8195.
- rebase on vdosys0 series v10. (ref [5])
- use drm to bring upovl_adaptordriver.
- move drm iommu/mutex check from kms init to drm bind.
- modify rdma binding doc location. (Documentation/devicetree/bindings/arm/)
- modify for reviewer's comment in v5.Changes in v5:
- add mmsys reset controller reference.Changes in v4:
- use merge common driver for merge1~4.
- refineovl_adaptorrdma driver.
- useovl_adaptorddp_compfunction instead of ethdr.
- modify for reviewer's comment in v3.Changes in v3:
- modify for reviewer's comment in v2.
- add vdosys1 2 pixels align limit.
- add mixer odd offset support.Changes in v2:
- MergePSEUDO_OVLand ETHDR into one DRM component.
- Add mmsys config API for vdosys1 hardware setting.
- Add mmsys reset control using linux reset framework.Signed-off-by Nancy.Lin <[email protected]>This series are based on the following patch:
[1] arm64: dts: Add mediatek SoC mt8195 and evaluation board[email protected] [2] arm64: dts: mt8195: add IOMMU and smi nodes [email protected] [3] arm64: dts: mt8195: add gce node [email protected] [4] [v2] arm64: dts: mt8195: add display node for vdosys0 [email protected] [5] Add MediaTek SoC DRM (vdosys0) support for mt8195 - v22 series [email protected] [6] dt-bindings: mediatek: mt8195: Add binding for MM IOMMU [email protected]Nancy.Lin (24):
dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195
dt-bindings: reset: mt8195: add vdosys1 reset control bit
dt-bindings: mediatek: add ethdr definition for mt8195
soc: mediatek: add mtk-mmsys ethdr andmdp_rdmacomponents
soc: mediatek: add mtk-mmsys support for mt8195 vdosys1
soc: mediatek: addmtk_mmsys_update_bitsAPI
soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1
soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195
vdosys1
soc: mediatek: mmsys: add mmsys for support 64 reset bits
soc: mediatek: mmsys: add reset control for MT8195 vdosys1
soc: mediatek: add mtk-mutex component -dp_intf1
soc: mediatek: add mtk-mutex support for mt8195 vdosys1 drm/mediatek: add display MDP RDMA support for MT8195 drm/mediatek: add display merge advance config API for MT8195 drm/mediatek: add display merge start/stop API for cmdq support drm/mediatek: add display merge mute/unmute support for MT8195 drm/mediatek: add display merge async reset control drm/mediatek: add ETHDR support for MT8195 drm/mediatek: add mediatek-drm plane color encoding info drm/mediatek: addovl_adaptorsupport for MT8195 drm/mediatek: add dma dev get function
drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support drm/mediatek: add drmovl_adaptorsub driver for MT8195 drm/mediatek: add mediatek-drm of vdosys1 support for MT8195.../display/mediatek/mediatek,ethdr.yaml | 188 +++++++ .../display/mediatek/mediatek,mdp-rdma.yaml | 88 +++ drivers/gpu/drm/mediatek/Makefile | 5 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 38 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 94 +++- .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 514 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 96 ++-- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 6 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 125 +++-- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 58 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 360 ++++++++---- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 25 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 1 + drivers/gpu/drm/mediatek/mtk_ethdr.c | 369 +++++++++++++ drivers/gpu/drm/mediatek/mtk_ethdr.h | 26 + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 315 +++++++++++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 20 + drivers/soc/mediatek/mt8195-mmsys.h | 146 +++++ drivers/soc/mediatek/mtk-mmsys.c | 134 +++-- drivers/soc/mediatek/mtk-mmsys.h | 1 + drivers/soc/mediatek/mtk-mutex.c | 37 ++ include/dt-bindings/reset/mt8195-resets.h | 45 ++ include/linux/soc/mediatek/mtk-mmsys.h | 25 + 24 files changed, 2479 insertions(+), 238 deletions(-) create mode 100644
Documentation/devicetree/bindings/display/mediatek/mediatek,ethdr.yaml
Quoted 12 lines
create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,mdp- rdma.yaml create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.h create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.hSignature · 1 line
2.18.0
Hello CK,
The binding series for MT8195 vdosys1 is sent to devicetree. It's passed for robh/checkpatch and robh/patch-applied. This series is based on 5.19-rc1 which is including iommu series. Result:
https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]/
https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]/
BRs,
Bo-Chen
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek