Re: [v2,6/6] drm/mediatek: add display support for MT8186

Hi, Rex:

On Tue, 2022-02-15 at 15:59 +0800, Rex-BC Chen wrote:

From: Yongqiang Niu yongqiang.niu@mediatek.com

• Add driver data for MT8186 in mtk_drm_drv.c.
• Add mtk-disp-ovl and mt-disp-ovl-2l support for MT8186.

Signed-off-by: Yongqiang Niu yongqiang.niu@mediatek.com Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com

---

drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 20 +++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 39 +++++++++++++++++++++++++ 2 files changed, 59 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c index 2146299e5f52..5fa56c7b9f5f 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -456,6 +456,22 @@ static const struct mtk_disp_ovl_data mt8183_ovl_2l_driver_data = { .fmt_rgb565_is_0 = true, };

+static const struct mtk_disp_ovl_data mt8186_ovl_driver_data = {

• .addr = DISP_REG_OVL_ADDR_MT8173,
• .gmc_bits = 10,
• .layer_nr = 4,
• .fmt_rgb565_is_0 = true,
• .smi_id_en = true,

+};

mt8186_ovl_driver_data is identical to mt8192_ovl_driver_data, so drop this one and use mt8192_ovl_driver_data instead.

+static const struct mtk_disp_ovl_data mt8186_ovl_2l_driver_data = {

• .addr = DISP_REG_OVL_ADDR_MT8173,
• .gmc_bits = 10,
• .layer_nr = 2,
• .fmt_rgb565_is_0 = true,
• .smi_id_en = true,

+};

Ditto.

Regards, CK

static const struct mtk_disp_ovl_data mt8192_ovl_driver_data = { .addr = DISP_REG_OVL_ADDR_MT8173, .gmc_bits = 10, @@ -479,8 +495,12 @@ static const struct of_device_id mtk_disp_ovl_driver_dt_match[] = { .data = &mt8173_ovl_driver_data}, { .compatible = "mediatek,mt8183-disp-ovl", .data = &mt8183_ovl_driver_data},

• { .compatible = "mediatek,mt8186-disp-ovl",

•  .data = &mt8186_ovl_driver_data},
  

  { .compatible = "mediatek,mt8183-disp-ovl-2l", .data = &mt8183_ovl_2l_driver_data},
• { .compatible = "mediatek,mt8186-disp-ovl-2l",

•  .data = &mt8186_ovl_2l_driver_data},
  

  { .compatible = "mediatek,mt8192-disp-ovl", .data = &mt8192_ovl_driver_data}, { .compatible = "mediatek,mt8192-disp-ovl-2l",

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 6efb423ccc92..754b1be25d0d 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -158,6 +158,24 @@ static const enum mtk_ddp_comp_id mt8183_mtk_ddp_ext[] = { DDP_COMPONENT_DPI0, };

+static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = {

• DDP_COMPONENT_OVL0,
• DDP_COMPONENT_RDMA0,
• DDP_COMPONENT_COLOR0,
• DDP_COMPONENT_CCORR,
• DDP_COMPONENT_AAL0,
• DDP_COMPONENT_GAMMA,
• DDP_COMPONENT_POSTMASK0,
• DDP_COMPONENT_DITHER,
• DDP_COMPONENT_DSI0,

+};

+static const enum mtk_ddp_comp_id mt8186_mtk_ddp_ext[] = {

• DDP_COMPONENT_OVL_2L0,
• DDP_COMPONENT_RDMA1,
• DDP_COMPONENT_DPI0,

+};

static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = { DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0, @@ -221,6 +239,13 @@ 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 mt8186_mmsys_driver_data = {

• .main_path = mt8186_mtk_ddp_main,
• .main_len = ARRAY_SIZE(mt8186_mtk_ddp_main),
• .ext_path = mt8186_mtk_ddp_ext,
• .ext_len = ARRAY_SIZE(mt8186_mtk_ddp_ext),

+};

static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { .main_path = mt8192_mtk_ddp_main, .main_len = ARRAY_SIZE(mt8192_mtk_ddp_main), @@ -463,6 +488,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8183-disp-mutex", .data = (void *)MTK_DISP_MUTEX },

• { .compatible = "mediatek,mt8186-disp-mutex",

•  .data = (void *)MTK_DISP_MUTEX },
  

  { .compatible = "mediatek,mt8192-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8173-disp-od",

@@ -475,14 +502,20 @@ 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,mt8186-disp-ovl",

•  .data = (void *)MTK_DISP_OVL },
  

  { .compatible = "mediatek,mt8192-disp-ovl", .data = (void *)MTK_DISP_OVL }, { .compatible = "mediatek,mt8183-disp-ovl-2l", .data = (void *)MTK_DISP_OVL_2L },
• { .compatible = "mediatek,mt8186-disp-ovl-2l",

•  .data = (void *)MTK_DISP_OVL_2L },
  

  { .compatible = "mediatek,mt8192-disp-ovl-2l", .data = (void *)MTK_DISP_OVL_2L }, { .compatible = "mediatek,mt8192-disp-postmask", .data = (void *)MTK_DISP_POSTMASK },
• { .compatible = "mediatek,mt8186-disp-postmask",

•  .data = (void *)MTK_DISP_POSTMASK},
  

  { .compatible = "mediatek,mt2701-disp-pwm", .data = (void *)MTK_DISP_BLS }, { .compatible = "mediatek,mt8167-disp-pwm",

@@ -511,12 +544,16 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI },

• { .compatible = "mediatek,mt8186-dpi",

•  .data = (void *)MTK_DPI },
  

  { .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,mt8186-dsi",

•  .data = (void *)MTK_DSI },
  

  { }

};

@@ -533,6 +570,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,mt8186-mmsys",

•  .data = &mt8186_mmsys_driver_data},
  

  { .compatible = "mediatek,mt8192-mmsys", .data = &mt8192_mmsys_driver_data}, { }