| Message ID | 20210906071539.12953-1-nancy.lin@mediatek.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add MediaTek SoC DRM (vdosys1) support for mt8195 | expand |
Hi Nancy, On Mon, Sep 06, 2021 at 03:15:23PM +0800, Nancy.Lin wrote: > 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 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. > > Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> > > This series are based on the following patch: > [1] arm64: dts: Add Mediatek SoC MT8195 and evaluation board dts and Makefile > https://patchwork.kernel.org/project/linux-mediatek/patch/20210601075350.31515-2-seiya.wang@mediatek.com/ > [2] arm64: dts: mt8195: add IOMMU and smi nodes > https://patchwork.kernel.org/project/linux-mediatek/patch/20210615173233.26682-15-tinghan.shen@mediatek.com/ > [3] [01/24] dt-bindings: mediatek: mt8195: Add binding for MM IOMMU > https://patchwork.kernel.org/project/linux-mediatek/patch/20210630023504.18177-2-yong.wu@mediatek.com/ > [4] Add gce support for mt8195 > https://patchwork.kernel.org/project/linux-mediatek/list/?series=537069 > [5] Add MediaTek SoC DRM (vdosys0) support for mt8195 > https://patchwork.kernel.org/project/linux-mediatek/list/?series=537225 > [6] [v8,1/2] dt-bindings: reset: mt8195: add toprgu reset-controller header file > https://patchwork.kernel.org/project/linux-mediatek/patch/20210806023606.16867-2-Christine.Zhu@mediatek.com/ > [7] [v3,2/7] dt-bindings: mediatek: Add #reset-cells to mmsys system controller > https://patchwork.kernel.org/project/linux-mediatek/patch/20210825122613.v3.2.I3f7f1c9a8e46be07d1757ddf4e0097535f3a7d41@changeid/ > [8] [v3,6/7] soc: mediatek: mmsys: Add reset controller support > https://patchwork.kernel.org/project/linux-mediatek/patch/20210825122613.v3.6.I15e2419141a69b2e5c7e700c34d92a69df47e04d@changeid/ My work is currently based on this patch series. Unfortunately with 5.15 I have a bit of trouble picking all the dependencies and run into many merge conflicts (probably I am missing pieces). I am trying to pick everything so that I have a good base for my patch. Do you by any chance have a public git branch with your patch series vdosys1 and all its dependencies on 5.15? That would make it a lot easier for me to work on top of it. Thanks, Markus > > Nancy.Lin (16): > dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195 > dt-bindings: mediatek: add vdosys1 MERGE property for mt8195 > dt-bindings: mediatek: add ethdr definition for mt8195 > dt-bindings: reset: mt8195: add vdosys1 reset control bit > arm64: dts: mt8195: add display node for vdosys1 > soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 > 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: modify reset controller for MT8195 vdosys1 > soc: mediatek: add mtk-mutex support for mt8195 vdosys1 > drm/mediatek: add display MDP RDMA support for MT8195 > drm/mediatek: add display merge api support for MT8195 > drm/mediatek: add ETHDR support for MT8195 > drm/mediatek: add ovl_adaptor support for MT8195 > drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support > drm/mediatek: add mediatek-drm of vdosys1 support for MT8195 > > .../display/mediatek/mediatek,ethdr.yaml | 144 ++++++ > .../display/mediatek/mediatek,mdp-rdma.yaml | 77 ++++ > .../display/mediatek/mediatek,merge.yaml | 3 + > arch/arm64/boot/dts/mediatek/mt8195.dtsi | 221 +++++++++ > drivers/gpu/drm/mediatek/Makefile | 5 +- > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 29 ++ > drivers/gpu/drm/mediatek/mtk_disp_merge.c | 78 +++- > .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 408 +++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 25 +- > drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 3 +- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 15 + > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 377 +++++++++++++--- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 9 +- > drivers/gpu/drm/mediatek/mtk_ethdr.c | 424 ++++++++++++++++++ > drivers/gpu/drm/mediatek/mtk_ethdr.h | 25 ++ > drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 301 +++++++++++++ > drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 37 ++ > drivers/soc/mediatek/mt8195-mmsys.h | 199 ++++++++ > drivers/soc/mediatek/mtk-mmsys.c | 76 +++- > drivers/soc/mediatek/mtk-mmsys.h | 11 + > drivers/soc/mediatek/mtk-mutex.c | 270 ++++++----- > include/dt-bindings/reset/mt8195-resets.h | 12 + > include/linux/soc/mediatek/mtk-mmsys.h | 22 + > 24 files changed, 2574 insertions(+), 198 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 > > -- > 2.18.0 >
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 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. Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> This series are based on the following patch: [1] arm64: dts: Add Mediatek SoC MT8195 and evaluation board dts and Makefile https://patchwork.kernel.org/project/linux-mediatek/patch/20210601075350.31515-2-seiya.wang@mediatek.com/ [2] arm64: dts: mt8195: add IOMMU and smi nodes https://patchwork.kernel.org/project/linux-mediatek/patch/20210615173233.26682-15-tinghan.shen@mediatek.com/ [3] [01/24] dt-bindings: mediatek: mt8195: Add binding for MM IOMMU https://patchwork.kernel.org/project/linux-mediatek/patch/20210630023504.18177-2-yong.wu@mediatek.com/ [4] Add gce support for mt8195 https://patchwork.kernel.org/project/linux-mediatek/list/?series=537069 [5] Add MediaTek SoC DRM (vdosys0) support for mt8195 https://patchwork.kernel.org/project/linux-mediatek/list/?series=537225 [6] [v8,1/2] dt-bindings: reset: mt8195: add toprgu reset-controller header file https://patchwork.kernel.org/project/linux-mediatek/patch/20210806023606.16867-2-Christine.Zhu@mediatek.com/ [7] [v3,2/7] dt-bindings: mediatek: Add #reset-cells to mmsys system controller https://patchwork.kernel.org/project/linux-mediatek/patch/20210825122613.v3.2.I3f7f1c9a8e46be07d1757ddf4e0097535f3a7d41@changeid/ [8] [v3,6/7] soc: mediatek: mmsys: Add reset controller support https://patchwork.kernel.org/project/linux-mediatek/patch/20210825122613.v3.6.I15e2419141a69b2e5c7e700c34d92a69df47e04d@changeid/ Nancy.Lin (16): dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195 dt-bindings: mediatek: add vdosys1 MERGE property for mt8195 dt-bindings: mediatek: add ethdr definition for mt8195 dt-bindings: reset: mt8195: add vdosys1 reset control bit arm64: dts: mt8195: add display node for vdosys1 soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 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: modify reset controller for MT8195 vdosys1 soc: mediatek: add mtk-mutex support for mt8195 vdosys1 drm/mediatek: add display MDP RDMA support for MT8195 drm/mediatek: add display merge api support for MT8195 drm/mediatek: add ETHDR support for MT8195 drm/mediatek: add ovl_adaptor support for MT8195 drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support drm/mediatek: add mediatek-drm of vdosys1 support for MT8195 .../display/mediatek/mediatek,ethdr.yaml | 144 ++++++ .../display/mediatek/mediatek,mdp-rdma.yaml | 77 ++++ .../display/mediatek/mediatek,merge.yaml | 3 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 221 +++++++++ drivers/gpu/drm/mediatek/Makefile | 5 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 29 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 78 +++- .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 408 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 25 +- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 3 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 15 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 377 +++++++++++++--- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 9 +- drivers/gpu/drm/mediatek/mtk_ethdr.c | 424 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_ethdr.h | 25 ++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 301 +++++++++++++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 37 ++ drivers/soc/mediatek/mt8195-mmsys.h | 199 ++++++++ drivers/soc/mediatek/mtk-mmsys.c | 76 +++- drivers/soc/mediatek/mtk-mmsys.h | 11 + drivers/soc/mediatek/mtk-mutex.c | 270 ++++++----- include/dt-bindings/reset/mt8195-resets.h | 12 + include/linux/soc/mediatek/mtk-mmsys.h | 22 + 24 files changed, 2574 insertions(+), 198 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