On Fri, Jan 29, 2021 at 4:49 PM Yongqiang Niu
<yongqiang.niu@xxxxxxxxxxxx> wrote:
>
> On Fri, 2021-01-29 at 16:35 +0800, CK Hu wrote:
> > On Fri, 2021-01-29 at 16:32 +0800, Yongqiang Niu wrote:
> > > On Fri, 2021-01-29 at 16:18 +0800, CK Hu wrote:
> > > > Hi, Hsin-Yi:
> > > >
> > > > On Fri, 2021-01-29 at 15:34 +0800, Hsin-Yi Wang wrote:
> > > > > From: Yongqiang Niu <yongqiang.niu@xxxxxxxxxxxx>
> > > > >
> > > > > This patch add component POSTMASK,
> > > > >
> > > > > Signed-off-by: Yongqiang Niu <yongqiang.niu@xxxxxxxxxxxx>
> > > > > Signed-off-by: Hsin-Yi Wang <hsinyi@xxxxxxxxxxxx>
> > > > > ---
> > > > > drivers/gpu/drm/mediatek/Makefile | 1 +
> > > > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 8 +
> > > > > drivers/gpu/drm/mediatek/mtk_disp_postmask.c | 161 +++++++++++++++++++
> > > > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 11 ++
> > > > > 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 +
> > > > > 7 files changed, 186 insertions(+), 1 deletion(-)
> > > > > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_postmask.c
> > > > >
> > > > > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
> > > > > index b64674b944860..13a0eafabf9c0 100644
> > > > > --- a/drivers/gpu/drm/mediatek/Makefile
> > > > > +++ b/drivers/gpu/drm/mediatek/Makefile
> > > > > @@ -3,6 +3,7 @@
> > > > > mediatek-drm-y := mtk_disp_color.o \
> > > > > mtk_disp_gamma.o \
> > > > > mtk_disp_ovl.o \
> > > > > + mtk_disp_postmask.o \
> > > > > mtk_disp_rdma.o \
> > > > > mtk_drm_crtc.o \
> > > > > mtk_drm_ddp_comp.o \
> > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > > > > index 02191010699f8..d74e85db3fcdf 100644
> > > > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > > > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > > > > @@ -37,6 +37,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_postmask_clk_enable(struct device *dev);
> > > > > +void mtk_postmask_clk_disable(struct device *dev);
> > > > > +void mtk_postmask_config(struct device *dev, unsigned int w,
> > > > > + unsigned int h, unsigned int vrefresh,
> > > > > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
> > > > > +void mtk_postmask_start(struct device *dev);
> > > > > +void mtk_postmask_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_postmask.c b/drivers/gpu/drm/mediatek/mtk_disp_postmask.c
> > > > > new file mode 100644
> > > > > index 0000000000000..d640cef9c15a4
> > > > > --- /dev/null
> > > > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_postmask.c
> > > > > @@ -0,0 +1,161 @@
> > > > > +/*
> > > > > + * SPDX-License-Identifier:
> > > > > + *
> > > > > + * Copyright (c) 2020 MediaTek Inc.
> > > >
> > > > 2021
> > > >
> > > > > + */
> > > > > +
> > > > > +#include <linux/clk.h>
> > > > > +#include <linux/component.h>
> > > > > +#include <linux/module.h>
> > > > > +#include <linux/of_device.h>
> > > > > +#include <linux/pm_runtime.h>
> > > > > +#include <linux/of_irq.h>
> > > > > +#include <linux/platform_device.h>
> > > > > +#include <linux/soc/mediatek/mtk-cmdq.h>
> > > > > +
> > > > > +#include "mtk_disp_drv.h"
> > > > > +#include "mtk_drm_crtc.h"
> > > > > +#include "mtk_drm_ddp_comp.h"
> > > > > +
> > > > > +#define DISP_POSTMASK_EN 0x0000
> > > > > +#define POSTMASK_EN BIT(0)
> > > > > +#define DISP_POSTMASK_CFG 0x0020
> > > > > +#define POSTMASK_RELAY_MODE BIT(0)
> > > > > +#define DISP_POSTMASK_SIZE 0x0030
> > > > > +
> > > > > +struct mtk_disp_postmask_data {
> > > > > + u32 reserved;
> > > > > +};
> > > >
> > > > Useless, so remove.
> > > >
> > > > > +
> > > > > +/**
> > > > > + * struct mtk_disp_postmask - DISP_postmask driver structure
> > > > > + * @ddp_comp - structure containing type enum and hardware resources
> > > > > + * @crtc - associated crtc to report irq events to
> > > > > + */
> > > > > +struct mtk_disp_postmask {
> > > > > + struct clk *clk;
> > > > > + void __iomem *regs;
> > > > > + struct cmdq_client_reg cmdq_reg;
> > > > > + const struct mtk_disp_postmask_data *data;
> > > > > +};
> > > > > +
> > > > > +int mtk_postmask_clk_enable(struct device *dev)
> > > > > +{
> > > > > + struct mtk_disp_postmask *postmask = dev_get_drvdata(dev);
> > > > > +
> > > > > + return clk_prepare_enable(postmask->clk);
> > > > > +}
> > > > > +
> > > > > +void mtk_postmask_clk_disable(struct device *dev)
> > > > > +{
> > > > > + struct mtk_disp_postmask *postmask = dev_get_drvdata(dev);
> > > > > +
> > > > > + clk_disable_unprepare(postmask->clk);
> > > > > +}
> > > > > +
> > > > > +void mtk_postmask_config(struct device *dev, unsigned int w,
> > > > > + unsigned int h, unsigned int vrefresh,
> > > > > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
> > > > > +{
> > > > > + struct mtk_disp_postmask *postmask = dev_get_drvdata(dev);
> > > > > +
> > > > > + mtk_ddp_write(cmdq_pkt, w << 16 | h, &postmask->cmdq_reg, postmask->regs,
> > > > > + DISP_POSTMASK_SIZE);
> > > > > + mtk_ddp_write(cmdq_pkt, POSTMASK_RELAY_MODE, &postmask->cmdq_reg,
> > > > > + postmask->regs, DISP_POSTMASK_CFG);
> > > > > +}
> > > > > +
> > > > > +void mtk_postmask_start(struct device *dev)
> > > > > +{
> > > > > + struct mtk_disp_postmask *postmask = dev_get_drvdata(dev);
> > > > > +
> > > > > + writel(POSTMASK_EN, postmask->regs + DISP_POSTMASK_EN);
> > > > > +}
> > > > > +
> > > > > +void mtk_postmask_stop(struct device *dev)
> > > > > +{
> > > > > + struct mtk_disp_postmask *postmask = dev_get_drvdata(dev);
> > > > > +
> > > > > + writel_relaxed(0x0, postmask->regs + DISP_POSTMASK_EN);
> > > > > +}
> > > > > +
> > > > > +static int mtk_disp_postmask_bind(struct device *dev, struct device *master, void *data)
> > > > > +{
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +static void mtk_disp_postmask_unbind(struct device *dev, struct device *master,
> > > > > + void *data)
> > > > > +{
> > > > > +}
> > > > > +
> > > > > +static const struct component_ops mtk_disp_postmask_component_ops = {
> > > > > + .bind = mtk_disp_postmask_bind,
> > > > > + .unbind = mtk_disp_postmask_unbind,
> > > > > +};
> > > > > +
> > > > > +static int mtk_disp_postmask_probe(struct platform_device *pdev)
> > > > > +{
> > > > > + struct device *dev = &pdev->dev;
> > > > > + struct mtk_disp_postmask *priv;
> > > > > + struct resource *res;
> > > > > + int ret;
> > > > > +
> > > > > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
> > > > > + if (!priv)
> > > > > + return -ENOMEM;
> > > > > +
> > > > > + priv->clk = devm_clk_get(dev, NULL);
> > > > > + if (IS_ERR(priv->clk)) {
> > > > > + dev_err(dev, "failed to get postmask clk\n");
> > > > > + return PTR_ERR(priv->clk);
> > > > > + }
> > > > > +
> > > > > + 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 postmask\n");
> > > > > + return PTR_ERR(priv->regs);
> > > > > + }
> > > > > +
> > > > > +#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->data = of_device_get_match_data(dev);
> > > > > + platform_set_drvdata(pdev, priv);
> > > > > +
> > > > > + pm_runtime_enable(dev);
> > > >
> > > > Why this?
> > >
> > > if add power domain information in dts, we need this to make sure
> > > display power domain will be off after module clock off.
> >
> > Please align all sub driver. All do or all not do.
> >
>
> add for gamma and color
> https://patchwork.kernel.org/project/linux-mediatek/patch/1610351031-21133-11-git-send-email-yongqiang.niu@xxxxxxxxxxxx/
> https://patchwork.kernel.org/project/linux-mediatek/patch/1610351031-21133-10-git-send-email-yongqiang.niu@xxxxxxxxxxxx/
>
> ovl and rdma in iommu series.
>
https://patchwork.kernel.org/project/linux-mediatek/patch/1610351031-21133-10-git-send-email-yongqiang.niu@xxxxxxxxxxxx/
CK suggested to move to another series.
> > >
> > > >
> > > > > +
> > > > > + ret = component_add(dev, &mtk_disp_postmask_component_ops);
> > > > > + if (ret)
> > > > > + dev_err(dev, "Failed to add component: %d\n", ret);
> > > > > +
> > > > > + return ret;
> > > > > +}
> > > > > +
> > > > > +static int mtk_disp_postmask_remove(struct platform_device *pdev)
> > > > > +{
> > > > > + component_del(&pdev->dev, &mtk_disp_postmask_component_ops);
> > > > > +
> > > > > + pm_runtime_disable(&pdev->dev);
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +static const struct of_device_id mtk_disp_postmask_driver_dt_match[] = {
> > > > > + {},
> > > > > +};
> > > > > +MODULE_DEVICE_TABLE(of, mtk_disp_postmask_driver_dt_match);
> > > > > +
> > > > > +struct platform_driver mtk_disp_postmask_driver = {
> > > > > + .probe = mtk_disp_postmask_probe,
> > > > > + .remove = mtk_disp_postmask_remove,
> > > > > + .driver = {
> > > > > + .name = "mediatek-disp-postmask",
> > > > > + .owner = THIS_MODULE,
> > > > > + .of_match_table = mtk_disp_postmask_driver_dt_match,
> > > > > + },
> > > > > +};
> > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > > > > index ccfaada998cf5..6c539783118dd 100644
> > > > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > > > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > > > > @@ -415,6 +415,14 @@ static const struct mtk_ddp_comp_funcs ddp_ovl = {
> > > > > .bgclr_in_off = mtk_ovl_bgclr_in_off,
> > > > > };
> > > > >
> > > > > +static const struct mtk_ddp_comp_funcs ddp_postmask = {
> > > > > + .clk_enable = mtk_postmask_clk_enable,
> > > > > + .clk_disable = mtk_postmask_clk_disable,
> > > >
> > > > tab.
> > > >
> > > > > + .config = mtk_postmask_config,
> > > > > + .start = mtk_postmask_start,
> > > > > + .stop = mtk_postmask_stop,
> > > > > +};
> > > > > +
> > > > > static const struct mtk_ddp_comp_funcs ddp_rdma = {
> > > > > .clk_enable = mtk_rdma_clk_enable,
> > > > > .clk_disable = mtk_rdma_clk_disable,
> > > > > @@ -450,6 +458,7 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = {
> > > > > [MTK_DISP_MUTEX] = "mutex",
> > > > > [MTK_DISP_OD] = "od",
> > > > > [MTK_DISP_BLS] = "bls",
> > > > > + [MTK_DISP_POSTMASK] = "postmask",
> > > > > };
> > > > >
> > > > > struct mtk_ddp_comp_match {
> > > > > @@ -480,6 +489,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = {
> > > > > [DDP_COMPONENT_OVL_2L0] = { MTK_DISP_OVL_2L, 0, &ddp_ovl },
> > > > > [DDP_COMPONENT_OVL_2L1] = { MTK_DISP_OVL_2L, 1, &ddp_ovl },
> > > > > [DDP_COMPONENT_OVL_2L2] = { MTK_DISP_OVL_2L, 2, &ddp_ovl },
> > > > > + [DDP_COMPONENT_POSTMASK0] = { MTK_DISP_POSTMASK, 0, &ddp_postmask },
> > > >
> > > > Make other row the same indent.
> > > >
> > > > > [DDP_COMPONENT_PWM0] = { MTK_DISP_PWM, 0, NULL },
> > > > > [DDP_COMPONENT_PWM1] = { MTK_DISP_PWM, 1, NULL },
> > > > > [DDP_COMPONENT_PWM2] = { MTK_DISP_PWM, 2, NULL },
> > > > > @@ -603,6 +613,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
> > > > > if (type == MTK_DISP_BLS ||
> > > > > type == MTK_DISP_COLOR ||
> > > > > type == MTK_DISP_GAMMA ||
> > > > > + type == MTK_DISP_POSTMASK ||
> > > > > type == MTK_DPI ||
> > > > > type == MTK_DSI ||
> > > > > type == MTK_DISP_OVL ||
> > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > > > > index bb914d976cf5d..cd1dec6b4cdf2 100644
> > > > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > > > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > > > > @@ -30,6 +30,7 @@ enum mtk_ddp_comp_type {
> > > > > MTK_DISP_UFOE,
> > > > > MTK_DSI,
> > > > > MTK_DPI,
> > > > > + MTK_DISP_POSTMASK,
> > > > > MTK_DISP_PWM,
> > > > > MTK_DISP_MUTEX,
> > > > > MTK_DISP_OD,
> > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > > > > index 486e73e675ad5..d99afc8528684 100644
> > > > > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > > > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > > > > @@ -531,7 +531,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
> > > > > private->comp_node[comp_id] = of_node_get(node);
> > > > >
> > > > > /*
> > > > > - * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have
> > > > > + * Currently only the COLOR, GAMMA, OVL, POSTMASK, RDMA, DSI, and DPI blocks have
> > > > > * separate component platform drivers and initialize their own
> > > > > * DDP component structure. The others are initialized here.
> > > > > */
> > > > > @@ -539,6 +539,7 @@ static int mtk_drm_probe(struct platform_device *pdev)
> > > > > comp_type == MTK_DISP_GAMMA ||
> > > > > comp_type == MTK_DISP_OVL ||
> > > > > comp_type == MTK_DISP_OVL_2L ||
> > > > > + comp_type == MTK_DISP_POSTMASK ||
> > > > > comp_type == MTK_DISP_RDMA ||
> > > > > comp_type == MTK_DSI ||
> > > > > comp_type == MTK_DPI) {
> > > > > @@ -637,6 +638,7 @@ static struct platform_driver * const mtk_drm_drivers[] = {
> > > > > &mtk_disp_color_driver,
> > > > > &mtk_disp_gamma_driver,
> > > > > &mtk_disp_ovl_driver,
> > > > > + &mtk_disp_postmask_driver,
> > > > > &mtk_disp_rdma_driver,
> > > > > &mtk_dpi_driver,
> > > > > &mtk_drm_platform_driver,
> > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> > > > > index 0e54e3d51014a..7e7b28e32aa2f 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_color_driver;
> > > > > extern struct platform_driver mtk_disp_gamma_driver;
> > > > > extern struct platform_driver mtk_disp_ovl_driver;
> > > > > +extern struct platform_driver mtk_disp_postmask_driver;
> > > > > extern struct platform_driver mtk_disp_rdma_driver;
> > > > > extern struct platform_driver mtk_dpi_driver;
> > > > > extern struct platform_driver mtk_dsi_driver;
> > > >
> > > >
> > >
> > >
> >
> >
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
