[v7, PATCH 7/7] drm/mediatek: add support for mediatek SOC MT8183

Yongqiang Niu yongqiang.niu at mediatek.com
Fri Jul 24 23:31:58 EDT 2020


On Thu, 2020-07-23 at 17:40 +0200, Matthias Brugger wrote:
> 
> On 23/07/2020 04:03, Yongqiang Niu wrote:
> > This patch add support for mediatek SOC MT8183
> > 1.ovl_2l share driver with ovl
> > 2.rdma1 share drive with rdma0, but fifo size is different
> > 3.add mt8183 mutex private data, and mmsys private data
> > 4.add mt8183 main and external path module for crtc create
> 
> Please fix your commit message, this is seems to describe what the whole series 
> is doing.

will fix in next version
> 
> Regards,
> Matthias
> 
> > 
> > Signed-off-by: Yongqiang Niu <yongqiang.niu at mediatek.com>
> > ---
> >   drivers/gpu/drm/mediatek/mtk_disp_ovl.c  | 18 ++++++++++++
> >   drivers/gpu/drm/mediatek/mtk_disp_rdma.c |  6 ++++
> >   drivers/gpu/drm/mediatek/mtk_drm_ddp.c   | 47 ++++++++++++++++++++++++++++++++
> >   drivers/gpu/drm/mediatek/mtk_drm_drv.c   | 43 +++++++++++++++++++++++++++++
> >   4 files changed, 114 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > index 28651bc..8cf9f3b 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c
> > @@ -430,11 +430,29 @@ static int mtk_disp_ovl_remove(struct platform_device *pdev)
> >   	.fmt_rgb565_is_0 = true,
> >   };
> >   
> > +static const struct mtk_disp_ovl_data mt8183_ovl_driver_data = {
> > +	.addr = DISP_REG_OVL_ADDR_MT8173,
> > +	.gmc_bits = 10,
> > +	.layer_nr = 4,
> > +	.fmt_rgb565_is_0 = true,
> > +};
> > +
> > +static const struct mtk_disp_ovl_data mt8183_ovl_2l_driver_data = {
> > +	.addr = DISP_REG_OVL_ADDR_MT8173,
> > +	.gmc_bits = 10,
> > +	.layer_nr = 2,
> > +	.fmt_rgb565_is_0 = true,
> > +};
> > +
> >   static const struct of_device_id mtk_disp_ovl_driver_dt_match[] = {
> >   	{ .compatible = "mediatek,mt2701-disp-ovl",
> >   	  .data = &mt2701_ovl_driver_data},
> >   	{ .compatible = "mediatek,mt8173-disp-ovl",
> >   	  .data = &mt8173_ovl_driver_data},
> > +	{ .compatible = "mediatek,mt8183-disp-ovl",
> > +	  .data = &mt8183_ovl_driver_data},
> > +	{ .compatible = "mediatek,mt8183-disp-ovl-2l",
> > +	  .data = &mt8183_ovl_2l_driver_data},
> >   	{},
> >   };
> >   MODULE_DEVICE_TABLE(of, mtk_disp_ovl_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> > index 794acc5..51f2a0c 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
> > @@ -355,11 +355,17 @@ static int mtk_disp_rdma_remove(struct platform_device *pdev)
> >   	.fifo_size = SZ_8K,
> >   };
> >   
> > +static const struct mtk_disp_rdma_data mt8183_rdma_driver_data = {
> > +	.fifo_size = 5 * SZ_1K,
> > +};
> > +
> >   static const struct of_device_id mtk_disp_rdma_driver_dt_match[] = {
> >   	{ .compatible = "mediatek,mt2701-disp-rdma",
> >   	  .data = &mt2701_rdma_driver_data},
> >   	{ .compatible = "mediatek,mt8173-disp-rdma",
> >   	  .data = &mt8173_rdma_driver_data},
> > +	{ .compatible = "mediatek,mt8183-disp-rdma",
> > +	  .data = &mt8183_rdma_driver_data},
> >   	{},
> >   };
> >   MODULE_DEVICE_TABLE(of, mtk_disp_rdma_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
> > index 014c1bb..60788c1 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp.c
> > @@ -15,6 +15,8 @@
> >   
> >   #define MT2701_DISP_MUTEX0_MOD0			0x2c
> >   #define MT2701_DISP_MUTEX0_SOF0			0x30
> > +#define MT8183_DISP_MUTEX0_MOD0			0x30
> > +#define MT8183_DISP_MUTEX0_SOF0			0x2c
> >   
> >   #define DISP_REG_MUTEX_EN(n)			(0x20 + 0x20 * (n))
> >   #define DISP_REG_MUTEX(n)			(0x24 + 0x20 * (n))
> > @@ -25,6 +27,18 @@
> >   
> >   #define INT_MUTEX				BIT(1)
> >   
> > +#define MT8183_MUTEX_MOD_DISP_RDMA0		0
> > +#define MT8183_MUTEX_MOD_DISP_RDMA1		1
> > +#define MT8183_MUTEX_MOD_DISP_OVL0		9
> > +#define MT8183_MUTEX_MOD_DISP_OVL0_2L		10
> > +#define MT8183_MUTEX_MOD_DISP_OVL1_2L		11
> > +#define MT8183_MUTEX_MOD_DISP_WDMA0		12
> > +#define MT8183_MUTEX_MOD_DISP_COLOR0		13
> > +#define MT8183_MUTEX_MOD_DISP_CCORR0		14
> > +#define MT8183_MUTEX_MOD_DISP_AAL0		15
> > +#define MT8183_MUTEX_MOD_DISP_GAMMA0		16
> > +#define MT8183_MUTEX_MOD_DISP_DITHER0		17
> > +
> >   #define MT8173_MUTEX_MOD_DISP_OVL0		11
> >   #define MT8173_MUTEX_MOD_DISP_OVL1		12
> >   #define MT8173_MUTEX_MOD_DISP_RDMA0		13
> > @@ -74,6 +88,10 @@
> >   #define MUTEX_SOF_DSI2			5
> >   #define MUTEX_SOF_DSI3			6
> >   
> > +#define MT8183_MUTEX_SOF_DPI0			2
> > +#define MT8183_MUTEX_EOF_DSI0			(MUTEX_SOF_DSI0 << 6)
> > +#define MT8183_MUTEX_EOF_DPI0			(MT8183_MUTEX_SOF_DPI0 << 6)
> > +
> >   
> >   struct mtk_disp_mutex {
> >   	int id;
> > @@ -153,6 +171,20 @@ struct mtk_ddp {
> >   	[DDP_COMPONENT_WDMA1] = MT8173_MUTEX_MOD_DISP_WDMA1,
> >   };
> >   
> > +static const unsigned int mt8183_mutex_mod[DDP_COMPONENT_ID_MAX] = {
> > +	[DDP_COMPONENT_AAL0] = MT8183_MUTEX_MOD_DISP_AAL0,
> > +	[DDP_COMPONENT_CCORR] = MT8183_MUTEX_MOD_DISP_CCORR0,
> > +	[DDP_COMPONENT_COLOR0] = MT8183_MUTEX_MOD_DISP_COLOR0,
> > +	[DDP_COMPONENT_DITHER] = MT8183_MUTEX_MOD_DISP_DITHER0,
> > +	[DDP_COMPONENT_GAMMA] = MT8183_MUTEX_MOD_DISP_GAMMA0,
> > +	[DDP_COMPONENT_OVL0] = MT8183_MUTEX_MOD_DISP_OVL0,
> > +	[DDP_COMPONENT_OVL_2L0] = MT8183_MUTEX_MOD_DISP_OVL0_2L,
> > +	[DDP_COMPONENT_OVL_2L1] = MT8183_MUTEX_MOD_DISP_OVL1_2L,
> > +	[DDP_COMPONENT_RDMA0] = MT8183_MUTEX_MOD_DISP_RDMA0,
> > +	[DDP_COMPONENT_RDMA1] = MT8183_MUTEX_MOD_DISP_RDMA1,
> > +	[DDP_COMPONENT_WDMA0] = MT8183_MUTEX_MOD_DISP_WDMA0,
> > +};
> > +
> >   static const unsigned int mt2712_mutex_sof[DDP_MUTEX_SOF_DSI3 + 1] = {
> >   	[DDP_MUTEX_SOF_SINGLE_MODE] = MUTEX_SOF_SINGLE_MODE,
> >   	[DDP_MUTEX_SOF_DSI0] = MUTEX_SOF_DSI0,
> > @@ -163,6 +195,12 @@ struct mtk_ddp {
> >   	[DDP_MUTEX_SOF_DSI3] = MUTEX_SOF_DSI3,
> >   };
> >   
> > +static const unsigned int mt8183_mutex_sof[DDP_MUTEX_SOF_DSI3 + 1] = {
> > +	[DDP_MUTEX_SOF_SINGLE_MODE] = MUTEX_SOF_SINGLE_MODE,
> > +	[DDP_MUTEX_SOF_DSI0] = MUTEX_SOF_DSI0 | MT8183_MUTEX_EOF_DSI0,
> > +	[DDP_MUTEX_SOF_DPI0] = MT8183_MUTEX_SOF_DPI0 | MT8183_MUTEX_EOF_DPI0,
> > +};
> > +
> >   static const struct mtk_ddp_data mt2701_ddp_driver_data = {
> >   	.mutex_mod = mt2701_mutex_mod,
> >   	.mutex_sof = mt2712_mutex_sof,
> > @@ -184,6 +222,13 @@ struct mtk_ddp {
> >   	.mutex_sof_reg = MT2701_DISP_MUTEX0_SOF0,
> >   };
> >   
> > +static const struct mtk_ddp_data mt8183_ddp_driver_data = {
> > +	.mutex_mod = mt8183_mutex_mod,
> > +	.mutex_sof = mt8183_mutex_sof,
> > +	.mutex_mod_reg = MT8183_DISP_MUTEX0_MOD0,
> > +	.mutex_sof_reg = MT8183_DISP_MUTEX0_SOF0,
> > +};
> > +
> >   struct mtk_disp_mutex *mtk_disp_mutex_get(struct device *dev, unsigned int id)
> >   {
> >   	struct mtk_ddp *ddp = dev_get_drvdata(dev);
> > @@ -402,6 +447,8 @@ static int mtk_ddp_remove(struct platform_device *pdev)
> >   	  .data = &mt2712_ddp_driver_data},
> >   	{ .compatible = "mediatek,mt8173-disp-mutex",
> >   	  .data = &mt8173_ddp_driver_data},
> > +	{ .compatible = "mediatek,mt8183-disp-mutex",
> > +	  .data = &mt8183_ddp_driver_data},
> >   	{},
> >   };
> >   MODULE_DEVICE_TABLE(of, ddp_driver_dt_match);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index 6bd3694..267e91e 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -119,6 +119,24 @@
> >   	DDP_COMPONENT_DPI0,
> >   };
> >   
> > +static const enum mtk_ddp_comp_id mt8183_mtk_ddp_main[] = {
> > +	DDP_COMPONENT_OVL0,
> > +	DDP_COMPONENT_OVL_2L0,
> > +	DDP_COMPONENT_RDMA0,
> > +	DDP_COMPONENT_COLOR0,
> > +	DDP_COMPONENT_CCORR,
> > +	DDP_COMPONENT_AAL0,
> > +	DDP_COMPONENT_GAMMA,
> > +	DDP_COMPONENT_DITHER,
> > +	DDP_COMPONENT_DSI0,
> > +};
> > +
> > +static const enum mtk_ddp_comp_id mt8183_mtk_ddp_ext[] = {
> > +	DDP_COMPONENT_OVL_2L1,
> > +	DDP_COMPONENT_RDMA1,
> > +	DDP_COMPONENT_DPI0,
> > +};
> > +
> >   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),
> > @@ -143,6 +161,13 @@
> >   	.ext_len = ARRAY_SIZE(mt8173_mtk_ddp_ext),
> >   };
> >   
> > +static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
> > +	.main_path = mt8183_mtk_ddp_main,
> > +	.main_len = ARRAY_SIZE(mt8183_mtk_ddp_main),
> > +	.ext_path = mt8183_mtk_ddp_ext,
> > +	.ext_len = ARRAY_SIZE(mt8183_mtk_ddp_ext),
> > +};
> > +
> >   static int mtk_drm_kms_init(struct drm_device *drm)
> >   {
> >   	struct mtk_drm_private *private = drm->dev_private;
> > @@ -380,12 +405,20 @@ static void mtk_drm_unbind(struct device *dev)
> >   	  .data = (void *)MTK_DISP_OVL },
> >   	{ .compatible = "mediatek,mt8173-disp-ovl",
> >   	  .data = (void *)MTK_DISP_OVL },
> > +	{ .compatible = "mediatek,mt8183-disp-ovl",
> > +	  .data = (void *)MTK_DISP_OVL },
> > +	{ .compatible = "mediatek,mt8183-disp-ovl-2l",
> > +	  .data = (void *)MTK_DISP_OVL_2L },
> >   	{ .compatible = "mediatek,mt2701-disp-rdma",
> >   	  .data = (void *)MTK_DISP_RDMA },
> >   	{ .compatible = "mediatek,mt8173-disp-rdma",
> >   	  .data = (void *)MTK_DISP_RDMA },
> > +	{ .compatible = "mediatek,mt8183-disp-rdma",
> > +	  .data = (void *)MTK_DISP_RDMA },
> >   	{ .compatible = "mediatek,mt8173-disp-wdma",
> >   	  .data = (void *)MTK_DISP_WDMA },
> > +	{ .compatible = "mediatek,mt8183-disp-ccorr",
> > +	  .data = (void *)MTK_DISP_CCORR },
> >   	{ .compatible = "mediatek,mt2701-disp-color",
> >   	  .data = (void *)MTK_DISP_COLOR },
> >   	{ .compatible = "mediatek,mt8173-disp-color",
> > @@ -394,22 +427,30 @@ static void mtk_drm_unbind(struct device *dev)
> >   	  .data = (void *)MTK_DISP_AAL},
> >   	{ .compatible = "mediatek,mt8173-disp-gamma",
> >   	  .data = (void *)MTK_DISP_GAMMA, },
> > +	{ .compatible = "mediatek,mt8183-disp-dither",
> > +	  .data = (void *)MTK_DISP_DITHER },
> >   	{ .compatible = "mediatek,mt8173-disp-ufoe",
> >   	  .data = (void *)MTK_DISP_UFOE },
> >   	{ .compatible = "mediatek,mt2701-dsi",
> >   	  .data = (void *)MTK_DSI },
> >   	{ .compatible = "mediatek,mt8173-dsi",
> >   	  .data = (void *)MTK_DSI },
> > +	{ .compatible = "mediatek,mt8183-dsi",
> > +	  .data = (void *)MTK_DSI },
> >   	{ .compatible = "mediatek,mt2701-dpi",
> >   	  .data = (void *)MTK_DPI },
> >   	{ .compatible = "mediatek,mt8173-dpi",
> >   	  .data = (void *)MTK_DPI },
> > +	{ .compatible = "mediatek,mt8183-dpi",
> > +	  .data = (void *)MTK_DPI },
> >   	{ .compatible = "mediatek,mt2701-disp-mutex",
> >   	  .data = (void *)MTK_DISP_MUTEX },
> >   	{ .compatible = "mediatek,mt2712-disp-mutex",
> >   	  .data = (void *)MTK_DISP_MUTEX },
> >   	{ .compatible = "mediatek,mt8173-disp-mutex",
> >   	  .data = (void *)MTK_DISP_MUTEX },
> > +	{ .compatible = "mediatek,mt8183-disp-mutex",
> > +	  .data = (void *)MTK_DISP_MUTEX },
> >   	{ .compatible = "mediatek,mt2701-disp-pwm",
> >   	  .data = (void *)MTK_DISP_BLS },
> >   	{ .compatible = "mediatek,mt8173-disp-pwm",
> > @@ -426,6 +467,8 @@ static void mtk_drm_unbind(struct device *dev)
> >   	  .data = &mt2712_mmsys_driver_data},
> >   	{ .compatible = "mediatek,mt8173-mmsys",
> >   	  .data = &mt8173_mmsys_driver_data},
> > +	{ .compatible = "mediatek,mt8183-mmsys",
> > +	  .data = &mt8183_mmsys_driver_data},
> >   	{ }
> >   };
> >   
> > 



More information about the Linux-mediatek mailing list