On Sat, 2021-08-07 at 01:10 +0800, Chun-Kuang Hu wrote: > Hi, Jason: > > jason-jh.lin <jason-jh.lin@xxxxxxxxxxxx> 於 2021年8月6日 週五 上午4:52寫道： > > > > Add MERGE engine file: > > MERGE module is used to merge two slice-per-line inputs > > into one side-by-side output. > > > > Signed-off-by: jason-jh.lin <jason-jh.lin@xxxxxxxxxxxx> > > --- > > This patch is base on [1] > > > > [1] dt-bindings: mediatek: display: add mt8195 SoC binding > > https://urldefense.com/v3/__https://patchwork.kernel.org/project/linux-mediatek/patch/20210805171346.24249-5-jason-jh.lin@xxxxxxxxxxxx/__;!!CTRNKA9wMg0ARbw!yUTG6rzENI8VUIZjGy5JTWKNX2TyyJn_wn66Wnx2J2GxzFaIhl21IuF8ZlfTqAyj6ahi$ > > > > --- > > drivers/gpu/drm/mediatek/Makefile | 1 + > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 8 + > > drivers/gpu/drm/mediatek/mtk_disp_merge.c | 263 > > ++++++++++++++++++++ > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 + > > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- > > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 + > > 6 files changed, 277 insertions(+), 1 deletion(-) > > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_merge.c > > > > diff --git a/drivers/gpu/drm/mediatek/Makefile > > b/drivers/gpu/drm/mediatek/Makefile > > index dc54a7a69005..538e0087a44c 100644 > > --- a/drivers/gpu/drm/mediatek/Makefile > > +++ b/drivers/gpu/drm/mediatek/Makefile > > @@ -3,6 +3,7 @@ > > mediatek-drm-y := mtk_disp_ccorr.o \ > > mtk_disp_color.o \ > > mtk_disp_gamma.o \ > > + mtk_disp_merge.o \ > > mtk_disp_ovl.o \ > > mtk_disp_rdma.o \ > > mtk_drm_crtc.o \ > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index cafd9df2d63b..f407cd9d873e 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -46,6 +46,14 @@ void mtk_gamma_set_common(void __iomem *regs, > > struct drm_crtc_state *state); > > void mtk_gamma_start(struct device *dev); > > void mtk_gamma_stop(struct device *dev); > > > > +int mtk_merge_clk_enable(struct device *dev); > > +void mtk_merge_clk_disable(struct device *dev); > > +void mtk_merge_config(struct device *dev, unsigned int width, > > + unsigned int height, unsigned int vrefresh, > > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > +void mtk_merge_start(struct device *dev); > > +void mtk_merge_stop(struct device *dev); > > + > > void mtk_ovl_bgclr_in_on(struct device *dev); > > void mtk_ovl_bgclr_in_off(struct device *dev); > > void mtk_ovl_bypass_shadow(struct device *dev); > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_merge.c > > b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > > new file mode 100644 > > index 000000000000..f3d262792054 > > --- /dev/null > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_merge.c > > @@ -0,0 +1,263 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (c) 2021 MediaTek Inc. > > + */ > > + > > +#include <linux/clk.h> > > +#include <linux/component.h> > > +#include <linux/of_device.h> > > +#include <linux/of_irq.h> > > +#include <linux/platform_device.h> > > +#include <linux/soc/mediatek/mtk-cmdq.h> > > + > > +#include "mtk_drm_ddp_comp.h" > > +#include "mtk_drm_drv.h" > > +#include "mtk_disp_drv.h" > > + > > +#define DISP_REG_MERGE_CTRL 0x000 > > +#define MERGE_EN 1 > > One more indent for the bitwise value. OK, I'll fix this. > > > +#define DISP_REG_MERGE_CFG_0 0x010 > > +#define DISP_REG_MERGE_CFG_4 0x020 > > +#define DISP_REG_MERGE_CFG_10 0x038 > > +/* no swap */ > > +#define SWAP_MODE 0 > > +#define FLD_SWAP_MODE GENMASK(4, 0) > > +#define DISP_REG_MERGE_CFG_12 0x040 > > +#define CFG_10_10_1PI_2PO_BUF_MODE 6 > > +#define CFG_10_10_2PI_2PO_BUF_MODE 8 > > +#define FLD_CFG_MERGE_MODE GENMASK(4, 0) > > +#define DISP_REG_MERGE_CFG_24 0x070 > > +#define DISP_REG_MERGE_CFG_25 0x074 > > +#define DISP_REG_MERGE_CFG_36 0x0a0 > > +#define ULTRA_EN 1 > > +#define PREULTRA_EN 1 > > +#define HALT_FOR_DVFS_EN 0 > > +#define FLD_ULTRA_EN GENMASK(0, 0) > > +#define FLD_PREULTRA_EN GENMASK(4, 4) > > +#define FLD_HALT_FOR_DVFS_EN GENMASK(8, 8) > > +#define DISP_REG_MERGE_CFG_37 0x0a4 > > +/* 0: Off, 1: SRAM0, 2: SRAM1, 3: SRAM0 + SRAM1 */ > > +#define BUFFER_MODE 3 > > +#define FLD_BUFFER_MODE GENMASK(1, 0) > > +#define DISP_REG_MERGE_CFG_38 0x0a8 > > +#define FLD_VDE_BLOCK_ULTRA GENMASK(0, 0) > > +#define FLD_VALID_TH_BLOCK_ULTRA GENMASK(4, 4) > > +#define FLD_ULTRA_FIFO_VALID_TH GENMASK(31, 16) > > +#define DISP_REG_MERGE_CFG_39 0x0ac > > +#define FLD_NVDE_FORCE_PREULTRA GENMASK(8, 8) > > +#define FLD_NVALID_TH_FORCE_PREULTRA GENMASK(12, 12) > > +#define FLD_PREULTRA_FIFO_VALID_TH GENMASK(31, 16) > > +#define DISP_REG_MERGE_CFG_40 0x0b0 > > +/* 6 us, 600M pixel/sec */ > > +#define ULTRA_TH_LOW (6 * 600) > > +/* 8 us, 600M pixel/sec */ > > +#define ULTRA_TH_HIGH (8 * 600) > > +#define FLD_ULTRA_TH_LOW GENMASK(15, 0) > > +#define FLD_ULTRA_TH_HIGH GENMASK(31, 16) > > +#define DISP_REG_MERGE_CFG_41 0x0b4 > > +/* 8 us, 600M pixel/sec */ > > +#define PREULTRA_TH_LOW (8 * 600) > > +/* 9 us, 600M pixel/sec */ > > Add comment that "6 us ~ 9us is experience value and max mmsys clock > frequency is 594MHz", and I think you should use 594 instead of 600. > > Regards, > Chun-Kuang. > OK, I'll add this comment and use 594 instead of 600. Regards, Jason-JH.Lin > > +#define PREULTRA_TH_HIGH (9 * 600) > > +#define FLD_PREULTRA_TH_LOW GENMASK(15, 0) > > +#define FLD_PREULTRA_TH_HIGH GENMASK(31, 16) > > + > > +struct mtk_disp_merge { > > + void __iomem *regs; > > + struct clk *clk; > > + struct clk *async_clk; > > + struct cmdq_client_reg cmdq_reg; > > + bool fifo_en; > > +}; > > + > > +void mtk_merge_start(struct device *dev) > > +{ > > + struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > + > > + writel(MERGE_EN, priv->regs + DISP_REG_MERGE_CTRL); > > +} > > + > > +void mtk_merge_stop(struct device *dev) > > +{ > > + struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > + > > + writel(0x0, priv->regs + DISP_REG_MERGE_CTRL); > > +} > > + > > +static void mtk_merge_fifo_setting(struct mtk_disp_merge *priv, > > + struct cmdq_pkt *handle) > > +{ > > + mtk_ddp_write_mask(handle, ULTRA_EN | PREULTRA_EN << 4 | > > HALT_FOR_DVFS_EN << 8, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_36, > > + FLD_ULTRA_EN | FLD_PREULTRA_EN | > > FLD_HALT_FOR_DVFS_EN); > > + > > + mtk_ddp_write_mask(handle, BUFFER_MODE, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_37, > > + FLD_BUFFER_MODE); > > + > > + mtk_ddp_write_mask(handle, 0, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_38, > > + FLD_VDE_BLOCK_ULTRA | > > FLD_VALID_TH_BLOCK_ULTRA | > > + FLD_ULTRA_FIFO_VALID_TH); > > + > > + mtk_ddp_write_mask(handle, 0, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_39, > > + FLD_NVDE_FORCE_PREULTRA | > > FLD_NVALID_TH_FORCE_PREULTRA | > > + FLD_PREULTRA_FIFO_VALID_TH); > > + > > + mtk_ddp_write_mask(handle, ULTRA_TH_LOW | ULTRA_TH_HIGH << > > 16, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_40, > > + FLD_ULTRA_TH_LOW | FLD_ULTRA_TH_HIGH); > > + > > + mtk_ddp_write_mask(handle, PREULTRA_TH_LOW | > > PREULTRA_TH_HIGH << 16, > > + &priv->cmdq_reg, priv->regs, > > DISP_REG_MERGE_CFG_41, > > + FLD_PREULTRA_TH_LOW | > > FLD_PREULTRA_TH_HIGH); > > +} > > + > > +void mtk_merge_config(struct device *dev, unsigned int w, > > + unsigned int h, unsigned int vrefresh, > > + unsigned int bpc, struct cmdq_pkt *handle) > > +{ > > + struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > + unsigned int mode = CFG_10_10_1PI_2PO_BUF_MODE; > > + > > + if (!h || !w) { > > + dev_err(dev, "%s: input width(%d) or height(%d) is > > invalid\n", __func__, w, h); > > + return; > > + } > > + > > + if (priv->fifo_en) { > > + mtk_merge_fifo_setting(priv, handle); > > + mode = CFG_10_10_2PI_2PO_BUF_MODE; > > + } > > + > > + mtk_ddp_write(handle, h << 16 | w, &priv->cmdq_reg, priv- > > >regs, > > + DISP_REG_MERGE_CFG_0); > > + mtk_ddp_write(handle, h << 16 | w, &priv->cmdq_reg, priv- > > >regs, > > + DISP_REG_MERGE_CFG_4); > > + mtk_ddp_write(handle, h << 16 | w, &priv->cmdq_reg, priv- > > >regs, > > + DISP_REG_MERGE_CFG_24); > > + mtk_ddp_write(handle, h << 16 | w, &priv->cmdq_reg, priv- > > >regs, > > + DISP_REG_MERGE_CFG_25); > > + mtk_ddp_write_mask(handle, SWAP_MODE, &priv->cmdq_reg, > > priv->regs, > > + DISP_REG_MERGE_CFG_10, FLD_SWAP_MODE); > > + mtk_ddp_write_mask(handle, mode, &priv->cmdq_reg, priv- > > >regs, > > + DISP_REG_MERGE_CFG_12, > > FLD_CFG_MERGE_MODE); > > +} > > + > > +int mtk_merge_clk_enable(struct device *dev) > > +{ > > + int ret = 0; > > + struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > + > > + ret = clk_prepare_enable(priv->clk); > > + if (ret) > > + pr_err("merge clk prepare enable failed\n"); > > + > > + if (priv->async_clk) { > > + ret = clk_prepare_enable(priv->async_clk); > > + if (ret) > > + pr_err("async clk prepare enable > > failed\n"); > > + } > > + > > + return ret; > > +} > > + > > +void mtk_merge_clk_disable(struct device *dev) > > +{ > > + struct mtk_disp_merge *priv = dev_get_drvdata(dev); > > + > > + if (priv->async_clk) > > + clk_disable_unprepare(priv->async_clk); > > + > > + clk_disable_unprepare(priv->clk); > > +} > > + > > +static int mtk_disp_merge_bind(struct device *dev, struct device > > *master, > > + void *data) > > +{ > > + return 0; > > +} > > + > > +static void mtk_disp_merge_unbind(struct device *dev, struct > > device *master, > > + void *data) > > +{ > > +} > > + > > +static const struct component_ops mtk_disp_merge_component_ops = { > > + .bind = mtk_disp_merge_bind, > > + .unbind = mtk_disp_merge_unbind, > > +}; > > + > > +static int mtk_disp_merge_probe(struct platform_device *pdev) > > +{ > > + struct device *dev = &pdev->dev; > > + struct resource *res; > > + struct mtk_disp_merge *priv; > > + int ret; > > + > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > > + if (!priv) > > + return -ENOMEM; > > + > > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + priv->regs = devm_ioremap_resource(dev, res); > > + if (IS_ERR(priv->regs)) { > > + dev_err(dev, "failed to ioremap merge\n"); > > + return PTR_ERR(priv->regs); > > + } > > + > > + priv->clk = devm_clk_get(dev, NULL); > > + if (IS_ERR(priv->clk)) { > > + dev_err(dev, "failed to get merge clk\n"); > > + return PTR_ERR(priv->clk); > > + } > > + > > + priv->async_clk = of_clk_get(dev->of_node, 1); > > + if (IS_ERR(priv->async_clk)) { > > + ret = PTR_ERR(priv->async_clk); > > + dev_dbg(dev, "No merge async clock: %d\n", ret); > > + priv->async_clk = NULL; > > + } > > + > > +#if IS_REACHABLE(CONFIG_MTK_CMDQ) > > + ret = cmdq_dev_get_client_reg(dev, &priv->cmdq_reg, 0); > > + if (ret) > > + dev_dbg(dev, "get mediatek,gce-client-reg > > fail!\n"); > > +#endif > > + > > + priv->fifo_en = of_property_read_bool(dev->of_node, > > + "mediatek,merge-fifo- > > en"); > > + > > + platform_set_drvdata(pdev, priv); > > + > > + ret = component_add(dev, &mtk_disp_merge_component_ops); > > + if (ret != 0) > > + dev_err(dev, "Failed to add component: %d\n", ret); > > + > > + return ret; > > +} > > + > > +static int mtk_disp_merge_remove(struct platform_device *pdev) > > +{ > > + component_del(&pdev->dev, &mtk_disp_merge_component_ops); > > + > > + return 0; > > +} > > + > > +static const struct of_device_id mtk_disp_merge_driver_dt_match[] > > = { > > + { .compatible = "mediatek,mt8195-disp-merge", }, > > + {}, > > +}; > > + > > +MODULE_DEVICE_TABLE(of, mtk_disp_merge_driver_dt_match); > > + > > +struct platform_driver mtk_disp_merge_driver = { > > + .probe = mtk_disp_merge_probe, > > + .remove = mtk_disp_merge_remove, > > + .driver = { > > + .name = "mediatek-disp-merge", > > + .owner = THIS_MODULE, > > + .of_match_table = mtk_disp_merge_driver_dt_match, > > + }, > > +}; > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > index 560be6bc9d0e..b42a47c06956 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h > > @@ -25,6 +25,7 @@ enum mtk_ddp_comp_type { > > MTK_DISP_DITHER, > > MTK_DISP_DSC, > > MTK_DISP_GAMMA, > > + MTK_DISP_MERGE, > > MTK_DISP_MUTEX, > > MTK_DISP_OD, > > MTK_DISP_OVL, > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > index a95dc1006b82..5eb9c0a04447 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > @@ -532,13 +532,14 @@ static int mtk_drm_probe(struct > > platform_device *pdev) > > private->comp_node[comp_id] = of_node_get(node); > > > > /* > > - * Currently only the CCORR, COLOR, GAMMA, OVL, > > RDMA, DSI, and DPI > > + * Currently only the CCORR, COLOR, GAMMA, MERGE, > > OVL, RDMA, DSI, and DPI > > * blocks have separate component platform drivers > > and initialize their own > > * DDP component structure. The others are > > initialized here. > > */ > > if (comp_type == MTK_DISP_CCORR || > > comp_type == MTK_DISP_COLOR || > > comp_type == MTK_DISP_GAMMA || > > + comp_type == MTK_DISP_MERGE || > > comp_type == MTK_DISP_OVL || > > comp_type == MTK_DISP_OVL_2L || > > comp_type == MTK_DISP_RDMA || > > @@ -639,6 +640,7 @@ static struct platform_driver * const > > mtk_drm_drivers[] = { > > &mtk_disp_ccorr_driver, > > &mtk_disp_color_driver, > > &mtk_disp_gamma_driver, > > + &mtk_disp_merge_driver, > > &mtk_disp_ovl_driver, > > &mtk_disp_rdma_driver, > > &mtk_dpi_driver, > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > > b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > > index 637f5669e895..0fa417219a69 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > > @@ -49,6 +49,7 @@ struct mtk_drm_private { > > 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_driver; > > extern struct platform_driver mtk_disp_rdma_driver; > > extern struct platform_driver mtk_dpi_driver; > > -- > > 2.18.0 > > -- Jason-JH Lin <jason-jh.lin@xxxxxxxxxxxx>
