Re: [PATCH v1 05/17] drm/mediatek: add mediatek-drm of vdosys0 support for MT8195

Re: [PATCH v1 05/17] drm/mediatek: add mediatek-drm of vdosys0 support for MT8195

[Jason-JH Lin]

On Wed, 2021-07-07 at 12:48 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add mediatek-drm of vdosys0 support for MT8195.
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 24
> > ++++++++++++++++++++++++
> >  1 file changed, 24 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index b46bdb8985da..9074ce32912c 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -147,6 +147,23 @@ static const enum mtk_ddp_comp_id
> > mt8183_mtk_ddp_ext[] = {
> >  	DDP_COMPONENT_DPI0,
> >  };
> >  
> > +static const enum mtk_ddp_comp_id mt8195_mtk_ddp_main[] = {
> > +	DDP_COMPONENT_OVL0,
> > +	DDP_COMPONENT_RDMA0,
> > +	DDP_COMPONENT_COLOR0,
> > +	DDP_COMPONENT_CCORR,
> > +	DDP_COMPONENT_AAL0,
> > +	DDP_COMPONENT_GAMMA,
> > +	DDP_COMPONENT_DITHER,
> > +#ifdef CONFIG_MTK_DPTX_SUPPORT
> > +	DDP_COMPONENT_DSC0,
> > +	DDP_COMPONENT_MERGE0,
> > +	DDP_COMPONENT_DP_INTF0,
> > +#else
> 
> CONFIG_MTK_DPTX_SUPPORT is not defined, so remove this part.
> 
> Regards,
> CK
> 

Hi CK,

OK, I'll remove this part at the next version.

Regard,
Jason-JH.Lin

> > +	DDP_COMPONENT_DSI0,
> > +#endif
> > +};
> > +
> >  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),
> > @@ -186,6 +203,11 @@ static const struct mtk_mmsys_driver_data
> > mt8183_mmsys_driver_data = {
> >  	.ext_len = ARRAY_SIZE(mt8183_mtk_ddp_ext),
> >  };
> >  
> > +static const struct mtk_mmsys_driver_data
> > mt8195_vdosys0_driver_data = {
> > +	.main_path = mt8195_mtk_ddp_main,
> > +	.main_len = ARRAY_SIZE(mt8195_mtk_ddp_main),
> > +};
> > +
> >  static int mtk_drm_kms_init(struct drm_device *drm)
> >  {
> >  	struct mtk_drm_private *private = drm->dev_private;
> > @@ -468,6 +490,8 @@ static const struct of_device_id
> > mtk_drm_of_ids[] = {
> >  	  .data = &mt8173_mmsys_driver_data},
> >  	{ .compatible = "mediatek,mt8183-mmsys",
> >  	  .data = &mt8183_mmsys_driver_data},
> > +	{.compatible = "mediatek,mt8195-vdosys0",
> > +	  .data = &mt8195_vdosys0_driver_data},
> >  	{ }
> >  };
> >  MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);
> 
> 

Re: [PATCH v1 07/17] drm/mediatek: add OVL support for MT8195

[Jason-JH Lin]

On Wed, 2021-07-07 at 13:03 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add OVL support for MT8195.
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 9 +++++++++
> >  drivers/gpu/drm/mediatek/mtk_drm_drv.c  | 2 ++
> >  2 files changed, 11 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 961f87f8d4d1..99c39487026d 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -455,6 +455,13 @@ static const struct mtk_disp_ovl_data
> > mt8183_ovl_2l_driver_data = {
> >  	.fmt_rgb565_is_0 = true,
> >  };
> >  
> > +static const struct mtk_disp_ovl_data mt8195_ovl_driver_data = {
> > +	.addr = DISP_REG_OVL_ADDR_MT8173,
> > +	.gmc_bits = 10,
> > +	.layer_nr = 4,
> > +	.fmt_rgb565_is_0 = true,
> > +};
> 
> mt8195_ovl_driver_data is identical to mt8183_ovl_driver_data, so
> remove
> mt8195_ovl_driver_data and use mt8183_ovl_driver_data.
> 
> > +
> >  static const struct of_device_id mtk_disp_ovl_driver_dt_match[] =
> > {
> >  	{ .compatible = "mediatek,mt2701-disp-ovl",
> >  	  .data = &mt2701_ovl_driver_data},
> > @@ -464,6 +471,8 @@ static const struct of_device_id
> > mtk_disp_ovl_driver_dt_match[] = {
> >  	  .data = &mt8183_ovl_driver_data},
> >  	{ .compatible = "mediatek,mt8183-disp-ovl-2l",
> >  	  .data = &mt8183_ovl_2l_driver_data},
> > +	{ .compatible = "mediatek,mt8195-disp-ovl",
> > +	  .data = &mt8195_ovl_driver_data},
> 
> One question, is mediatek,mt8195-disp-ovl identical to
> mediatek,mt8183-disp-ovl in hardware function? If so, use the
> compatible
> as
> 
> compatible = "mediatek,mt8195-disp-ovl", "mediatek,mt8183-disp-ovl";
> 
> And driver just keep "mediatek,mt8183-disp-ovl" and remove
> "mediatek,mt8195-disp-ovl".
> 
> If the hardware function has some different, just forget this.
> 
> Regards,
> CK
> 
Hi CK,

OK, I'll remove this patch at the next version.

Regard,
Jason-JH.Lin
> >  	{},
> >  };
> >  MODULE_DEVICE_TABLE(of, mtk_disp_ovl_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index 5b7ead493487..65038d5b19cb 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -424,6 +424,8 @@ static const struct of_device_id
> > mtk_ddp_comp_dt_ids[] = {
> >  	  .data = (void *)MTK_DISP_OVL },
> >  	{ .compatible = "mediatek,mt8183-disp-ovl",
> >  	  .data = (void *)MTK_DISP_OVL },
> > +	{ .compatible = "mediatek,mt8195-disp-ovl",
> > +	  .data = (void *)MTK_DISP_OVL },
> >  	{ .compatible = "mediatek,mt8183-disp-ovl-2l",
> >  	  .data = (void *)MTK_DISP_OVL_2L },
> >  	{ .compatible = "mediatek,mt2701-disp-rdma",
> 
> 

Re: [PATCH v1 08/17] drm/mediatek: Add component_del in OVL remove function

[Jason-JH Lin]

On Wed, 2021-07-07 at 13:12 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add component_del in OVL remove function.
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 99c39487026d..7504e86b167a 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -158,7 +158,6 @@ void mtk_ovl_stop(struct device *dev)
> >  		reg = reg & ~OVL_LAYER_SMI_ID_EN;
> >  		writel_relaxed(reg, ovl->regs +
> > DISP_REG_OVL_DATAPATH_CON);
> >  	}
> > -
> 
> This modification is not related to this patch, so move out of this
> patch.
> 
Hi CK,

OK, I'll remove this patch at the next version.

Regard,
Jason-JH.Lin
> >  }
> >  
> >  void mtk_ovl_config(struct device *dev, unsigned int w,
> > @@ -424,6 +423,8 @@ static int mtk_disp_ovl_probe(struct
> > platform_device *pdev)
> >  
> >  static int mtk_disp_ovl_remove(struct platform_device *pdev)
> >  {
> > +	component_del(&pdev->dev, &mtk_disp_ovl_component_ops);
> > +
> 
> This is a fix-up of patch [1]. Change this patch to fix all sub
> drivers,
> add Fixes tag, and move this patch out of this series. (This fix-up
> is
> not related to mt8195, so send this patch independently).
> 
> [1]
> 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.13&id=ff1395609e20c1cd98b3ec65d16dc18f0471dca3
> 
> Regards,
> CK
> 
> >  	return 0;
> >  }
> >  
> 
> 

Re: [PATCH v1 09/17] drm/mediatek: add OVL support multi-layer

[Jason-JH Lin]

On Wed, 2021-07-07 at 13:43 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add datapath_con settings to support multi-layer output.
> 
> 
> What is multi-layer output? Why we need this?
> 
Hi CK,

This patch is not the multi-layer output fix up patch.
The fix up patch is this one:

https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/commit/drivers/gpu/drm/mediatek/mtk_disp_ovl.c?h=mediatek-drm-next&id=d41ff4dcf093885dcc253e3861834eea294827cb

So this patch is not necessary for mt8195 DRM series patches.
I'll remove this patch at the next version.

By the way, this patches is for:
1. If GCLAST is not enabled, SMI will not know if the group is over.
SMI will wait until the last signal is received before it starts to
act.
It may cause OVL can not receive any data from SMI.

To support OVL multi-layer output, add datapath_con settings below:
GCLAST_EN = BIT(24), enable last SMI signal of ovl group
HDR_GCLAST_EN = BIT(25), enable last SMI signal of ovl AFBC group

2. After OUTPUT_CLAMP is enabled, the data will be rounded from 12-bit
to 10-bit. Because the modules after OVL need 10-bit input currently.
It may cause underflow problem, if there is no rounding to 10-bit.

To support 10bit data rounding, add datapath_con settings below:
OUTPUT_CLAMP = BIT(26), rounding data from 12-bit to 10-bit

Regard,
Jason-JH.Lin
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 15 ++++++++++++---
> >  1 file changed, 12 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 7504e86b167a..95fd5e00eb91 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -18,14 +18,17 @@
> >  #include "mtk_drm_ddp_comp.h"
> >  
> >  #define DISP_REG_OVL_INTEN			0x0004
> > -#define OVL_FME_CPL_INT					BIT(1)
> > +#define OVL_FME_CPL_INT				BIT(1)
> >  #define DISP_REG_OVL_INTSTA			0x0008
> >  #define DISP_REG_OVL_EN				0x000c
> >  #define DISP_REG_OVL_RST			0x0014
> >  #define DISP_REG_OVL_ROI_SIZE			0x0020
> >  #define DISP_REG_OVL_DATAPATH_CON		0x0024
> > -#define OVL_LAYER_SMI_ID_EN				BIT(0)
> > -#define OVL_BGCLR_SEL_IN				BIT(2)
> > +#define OVL_LAYER_SMI_ID_EN			BIT(0)
> > +#define OVL_BGCLR_SEL_IN			BIT(2)
> > +#define OVL_GCLAST_EN				BIT(24)
> > +#define OVL_HDR_GCLAST_EN			BIT(25)
> > +#define OVL_OUTPUT_CLAMP			BIT(26)
> >  #define DISP_REG_OVL_ROI_BGCLR			0x0028
> >  #define DISP_REG_OVL_SRC_CON			0x002c
> >  #define DISP_REG_OVL_CON(n)			(0x0030 + 0x20
> > * (n))
> > @@ -222,6 +225,7 @@ void mtk_ovl_layer_on(struct device *dev,
> > unsigned int idx,
> >  	unsigned int gmc_thrshd_l;
> >  	unsigned int gmc_thrshd_h;
> >  	unsigned int gmc_value;
> > +	unsigned int datapatch_con;
> >  	struct mtk_disp_ovl *ovl = dev_get_drvdata(dev);
> >  
> >  	mtk_ddp_write(cmdq_pkt, 0x1, &ovl->cmdq_reg, ovl->regs,
> > @@ -237,6 +241,11 @@ void mtk_ovl_layer_on(struct device *dev,
> > unsigned int idx,
> >  			    gmc_thrshd_h << 16 | gmc_thrshd_h << 24;
> >  	mtk_ddp_write(cmdq_pkt, gmc_value,
> >  		      &ovl->cmdq_reg, ovl->regs,
> > DISP_REG_OVL_RDMA_GMC(idx));
> > +
> > +	datapatch_con = OVL_GCLAST_EN | OVL_HDR_GCLAST_EN |
> > OVL_OUTPUT_CLAMP;
> > +	mtk_ddp_write_mask(cmdq_pkt, datapatch_con, &ovl->cmdq_reg,
> > ovl->regs,
> > +				 DISP_REG_OVL_DATAPATH_CON,
> > datapatch_con);
> 
> For mt8173 or other SoC, this does not turn on. Now you turn on this,
> would this influence other SoC?
> 
> Regards,
> CK
> 
> > +
> >  	mtk_ddp_write_mask(cmdq_pkt, BIT(idx), &ovl->cmdq_reg, ovl-
> > >regs,
> >  			   DISP_REG_OVL_SRC_CON, BIT(idx));
> >  }
> 
> 

Re: [PATCH v1 11/17] drm/mediatek: add COLOR support for MT8195

[Jason-JH Lin]

On Wed, 2021-07-07 at 14:01 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add COLOR support for MT8195.
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_color.c | 6 ++++++
> >  drivers/gpu/drm/mediatek/mtk_drm_drv.c    | 2 ++
> >  2 files changed, 8 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> > index 63f411ab393b..ce2cf9f504cc 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_color.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_color.c
> > @@ -149,6 +149,10 @@ static const struct mtk_disp_color_data
> > mt8173_color_driver_data = {
> >  	.color_offset = DISP_COLOR_START_MT8173,
> >  };
> >  
> > +static const struct mtk_disp_color_data mt8195_color_driver_data =
> > {
> > +	.color_offset = DISP_COLOR_START_MT8173,
> > +};
> 
> mt8195_color_driver_data is identical to mt8173_color_driver_data, so
> use mt8173_color_driver_data and remove mt8195_color_driver_data.
> 
> > +
> >  static const struct of_device_id mtk_disp_color_driver_dt_match[]
> > = {
> >  	{ .compatible = "mediatek,mt2701-disp-color",
> >  	  .data = &mt2701_color_driver_data},
> > @@ -156,6 +160,8 @@ static const struct of_device_id
> > mtk_disp_color_driver_dt_match[] = {
> >  	  .data = &mt8167_color_driver_data},
> >  	{ .compatible = "mediatek,mt8173-disp-color",
> >  	  .data = &mt8173_color_driver_data},
> > +	{ .compatible = "mediatek,mt8195-disp-color",
> > +	  .data = &mt8195_color_driver_data},
> >  	{},
> >  };
> >  MODULE_DEVICE_TABLE(of, mtk_disp_color_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index 8b24623dcd91..28bf4a11efb0 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -444,6 +444,8 @@ static const struct of_device_id
> > mtk_ddp_comp_dt_ids[] = {
> >  	  .data = (void *)MTK_DISP_COLOR },
> >  	{ .compatible = "mediatek,mt8173-disp-color",
> >  	  .data = (void *)MTK_DISP_COLOR },
> > +	{ .compatible = "mediatek,mt8195-disp-color",
> > +	  .data = (void *)MTK_DISP_COLOR },
> 
> Is mediatek,mt8195-disp-color identical to
> mediatek,mt8173-disp-color in hardware function? If so, use the
> compatible
> as
> 
> compatible = "mediatek,mt8195-disp-color", "mediatek,mt8173-disp-
> color";
> 
> And driver just keep "mediatek,mt8173-disp-color" and remove
> "mediatek,mt8195-disp-color".
> 
> If the hardware function has some different, just forget this.
> 
> Regards,
> CK
> 
Hi CK,

OK, I'll remove this patch at the next version.

Regard,
Jason-JH.Lin
> >  	{ .compatible = "mediatek,mt8173-disp-aal",
> >  	  .data = (void *)MTK_DISP_AAL},
> >  	{ .compatible = "mediatek,mt8173-disp-gamma",
> 
> 

Re: [PATCH v1 12/17] drm/mediatek: add CCORR support for MT8195

[Jason-JH Lin]

On Wed, 2021-07-07 at 14:02 +0800, CK Hu wrote:
> Hi, Jason:
> 
> On Wed, 2021-07-07 at 12:12 +0800, jason-jh.lin wrote:
> > Add CCORR support for MT8195.
> > 
> > Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 2 ++
> >  drivers/gpu/drm/mediatek/mtk_drm_drv.c    | 2 ++
> >  2 files changed, 4 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> > b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> > index 141cb36b9c07..8188b220cc6d 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
> > @@ -208,6 +208,8 @@ static const struct mtk_disp_ccorr_data
> > mt8183_ccorr_driver_data = {
> >  static const struct of_device_id mtk_disp_ccorr_driver_dt_match[]
> > = {
> >  	{ .compatible = "mediatek,mt8183-disp-ccorr",
> >  	  .data = &mt8183_ccorr_driver_data},
> > +	{ .compatible = "mediatek,mt8195-disp-ccorr",
> > +	  .data = &mt8183_ccorr_driver_data},
> >  	{},
> >  };
> >  MODULE_DEVICE_TABLE(of, mtk_disp_ccorr_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index 28bf4a11efb0..058b50d0e64b 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -440,6 +440,8 @@ static const struct of_device_id
> > mtk_ddp_comp_dt_ids[] = {
> >  	  .data = (void *)MTK_DISP_WDMA },
> >  	{ .compatible = "mediatek,mt8183-disp-ccorr",
> >  	  .data = (void *)MTK_DISP_CCORR },
> > +	{ .compatible = "mediatek,mt8195-disp-ccorr",
> > +	  .data = (void *)MTK_DISP_CCORR },
> 
> The same question as OVL and COLOR.
> 
> Regards,
> CK
> 
Hi CK,

OK, I'll remove this patch at the next version.

Regard,
Jason-JH.Lin
> >  	{ .compatible = "mediatek,mt2701-disp-color",
> >  	  .data = (void *)MTK_DISP_COLOR },
> >  	{ .compatible = "mediatek,mt8173-disp-color",
> 
>