| Message ID | 20231023-display-support-v3-14-53388f3ed34b@baylibre.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Add display support for the MT8365-EVK board | expand |
Il 18/04/24 16:17, amergnat@baylibre.com ha scritto: > From: Fabien Parent <fparent@baylibre.com> > > Add DRM support for MT8365 SoC. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Signed-off-by: Alexandre Mergnat <amergnat@baylibre.com> There are two things that I want to point out. Please check below. The series that I've sent for adding OF Graphs [1] support to MediaTek DRM is not going to be picked in time for v6.10, but I think neither your MT8365 support series is, and that's why I'm telling you this. If your work was based off my series, you would not need to add the MT8365 ddp MAIN and EXT paths to mtk_drm_drv: you'd just add it to the bindings and then you would declare the paths in devicetree. [1]: https://lore.kernel.org/r/20240409120211.321153-1-angelogioacchino.delregno@collabora.com There's also one more comment.... > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 74832c213092..427b601309c4 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c ..snip.. > @@ -793,6 +821,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { > .data = (void *)MTK_DSI }, > { .compatible = "mediatek,mt8188-dsi", > .data = (void *)MTK_DSI }, > + { .compatible = "mediatek,mt8365-dpi", You removed the mt8365 specific compatible from the DPI driver - why did you keep it here?! that's not needed! :-) Cheers, Angelo > + .data = (void *)MTK_DPI }, > { } > }; > >
On 19/04/2024 10:01, AngeloGioacchino Del Regno wrote: > Il 18/04/24 16:17, amergnat@baylibre.com ha scritto: >> From: Fabien Parent <fparent@baylibre.com> >> >> Add DRM support for MT8365 SoC. >> >> Signed-off-by: Fabien Parent <fparent@baylibre.com> >> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> Signed-off-by: Alexandre Mergnat <amergnat@baylibre.com> > > There are two things that I want to point out. Please check below. > > The series that I've sent for adding OF Graphs [1] support to MediaTek DRM is > not going to be picked in time for v6.10, but I think neither your MT8365 support > series is, and that's why I'm telling you this. > > If your work was based off my series, you would not need to add the MT8365 ddp > MAIN and EXT paths to mtk_drm_drv: you'd just add it to the bindings and then > you would declare the paths in devicetree. Ok then I will rebase my v4 on top of your serie > > > [1]: https://lore.kernel.org/r/20240409120211.321153-1-angelogioacchino.delregno@collabora.com > > There's also one more comment.... > >> --- >> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 30 ++++++++++++++++++++++++++++++ >> 1 file changed, 30 insertions(+) >> >> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> index 74832c213092..427b601309c4 100644 >> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c >> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > ..snip.. > >> @@ -793,6 +821,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { >> .data = (void *)MTK_DSI }, >> { .compatible = "mediatek,mt8188-dsi", >> .data = (void *)MTK_DSI }, >> + { .compatible = "mediatek,mt8365-dpi", > > You removed the mt8365 specific compatible from the DPI driver - why did you keep > it here?! that's not needed! :-) Sorry for that, I forgot to remove it in this driver too. Thanks to catched it. > > Cheers, > Angelo > >> + .data = (void *)MTK_DPI }, >> { } >> }; >> >
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 74832c213092..427b601309c4 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -230,6 +230,22 @@ static const unsigned int mt8195_mtk_ddp_ext[] = { DDP_COMPONENT_DP_INTF1, }; +static const unsigned int mt8365_mtk_ddp_main[] = { + DDP_COMPONENT_OVL0, + DDP_COMPONENT_RDMA0, + DDP_COMPONENT_COLOR0, + DDP_COMPONENT_CCORR, + DDP_COMPONENT_AAL0, + DDP_COMPONENT_GAMMA, + DDP_COMPONENT_DITHER0, + DDP_COMPONENT_DSI0, +}; + +static const unsigned int mt8365_mtk_ddp_ext[] = { + 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), @@ -317,6 +333,14 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { .mmsys_dev_num = 2, }; +static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = { + .main_path = mt8365_mtk_ddp_main, + .main_len = ARRAY_SIZE(mt8365_mtk_ddp_main), + .ext_path = mt8365_mtk_ddp_ext, + .ext_len = ARRAY_SIZE(mt8365_mtk_ddp_ext), + .mmsys_dev_num = 1, +}; + static const struct of_device_id mtk_drm_of_ids[] = { { .compatible = "mediatek,mt2701-mmsys", .data = &mt2701_mmsys_driver_data}, @@ -344,6 +368,8 @@ static const struct of_device_id mtk_drm_of_ids[] = { .data = &mt8195_vdosys0_driver_data}, { .compatible = "mediatek,mt8195-vdosys1", .data = &mt8195_vdosys1_driver_data}, + { .compatible = "mediatek,mt8365-mmsys", + .data = &mt8365_mmsys_driver_data}, { } }; MODULE_DEVICE_TABLE(of, mtk_drm_of_ids); @@ -729,6 +755,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8195-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, + { .compatible = "mediatek,mt8365-disp-mutex", + .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8173-disp-od", .data = (void *)MTK_DISP_OD }, { .compatible = "mediatek,mt2701-disp-ovl", @@ -793,6 +821,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DSI }, { .compatible = "mediatek,mt8188-dsi", .data = (void *)MTK_DSI }, + { .compatible = "mediatek,mt8365-dpi", + .data = (void *)MTK_DPI }, { } };