| Message ID | 20220110084645.31191-22-nancy.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add MediaTek SoC DRM (vdosys1) support for mt8195 | expand |
Il 10/01/22 09:46, Nancy.Lin ha scritto: > Add driver data of mt8195 vdosys1 to mediatek-drm. > > Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Hi, Nancy: On Mon, 2022-01-10 at 16:46 +0800, Nancy.Lin wrote: > Add driver data of mt8195 vdosys1 to mediatek-drm. > > Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 36430f956b4f..e851c56f00b1 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -190,6 +190,14 @@ static const enum mtk_ddp_comp_id > mt8195_mtk_ddp_main[] = { > DDP_COMPONENT_DP_INTF0, > }; > > +static const enum mtk_ddp_comp_id mt8195_mtk_ddp_ext[] = { > + DDP_COMPONENT_OVL_ADAPTOR, > + DDP_COMPONENT_MERGE5, > + DDP_COMPONENT_DP_INTF1, > +}; > + > +static const int mt8195_vdosys1_mtk_cmdq_mbox[] = {-1, 0, -1}; What does this array mean? These number looks so magic. Regards, CK > + > 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), > @@ -254,6 +262,14 @@ static const struct mtk_mmsys_driver_data > mt8195_vdosys0_driver_data = { > .mmsys_dev_num = 2, > }; > > +static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data > = { > + .ext_path = mt8195_mtk_ddp_ext, > + .ext_len = ARRAY_SIZE(mt8195_mtk_ddp_ext), > + .mmsys_id = 1, > + .mmsys_dev_num = 2, > + .mbox_index = mt8195_vdosys1_mtk_cmdq_mbox, > +}; > + > static const struct of_device_id mtk_drm_of_ids[] = { > { .compatible = "mediatek,mt2701-mmsys", > .data = &mt2701_mmsys_driver_data}, > @@ -271,6 +287,8 @@ static const struct of_device_id mtk_drm_of_ids[] > = { > .data = &mt8192_mmsys_driver_data}, > { .compatible = "mediatek,mt8195-vdosys0", > .data = &mt8195_vdosys0_driver_data}, > + { .compatible = "mediatek,mt8195-vdosys1", > + .data = &mt8195_vdosys1_driver_data}, > { } > }; > MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);
Hi Chun-Kuang, Thanks for the review. On Mon, 2022-01-24 at 15:18 +0800, CK Hu wrote: > Hi, Nancy: > > On Mon, 2022-01-10 at 16:46 +0800, Nancy.Lin wrote: > > Add driver data of mt8195 vdosys1 to mediatek-drm. > > > > Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> > > --- > > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 ++++++++++++++++++ > > 1 file changed, 18 insertions(+) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > index 36430f956b4f..e851c56f00b1 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > > @@ -190,6 +190,14 @@ static const enum mtk_ddp_comp_id > > mt8195_mtk_ddp_main[] = { > > DDP_COMPONENT_DP_INTF0, > > }; > > > > +static const enum mtk_ddp_comp_id mt8195_mtk_ddp_ext[] = { > > + DDP_COMPONENT_OVL_ADAPTOR, > > + DDP_COMPONENT_MERGE5, > > + DDP_COMPONENT_DP_INTF1, > > +}; > > + > > +static const int mt8195_vdosys1_mtk_cmdq_mbox[] = {-1, 0, -1}; > > What does this array mean? These number looks so magic. > > Regards, > CK > Since vdosys0 and vdosys1 are different mmsys, this array is used to specify which index of mmsys mailbox in dts to be used by crtc. I will modify it and calculate the corresponding index to be used in mtk_drm_kms_init() instead of using mmsys private data to record. Regards, Nancy > > + > > 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), > > @@ -254,6 +262,14 @@ static const struct mtk_mmsys_driver_data > > mt8195_vdosys0_driver_data = { > > .mmsys_dev_num = 2, > > }; > > > > +static const struct mtk_mmsys_driver_data > > mt8195_vdosys1_driver_data > > = { > > + .ext_path = mt8195_mtk_ddp_ext, > > + .ext_len = ARRAY_SIZE(mt8195_mtk_ddp_ext), > > + .mmsys_id = 1, > > + .mmsys_dev_num = 2, > > + .mbox_index = mt8195_vdosys1_mtk_cmdq_mbox, > > +}; > > + > > static const struct of_device_id mtk_drm_of_ids[] = { > > { .compatible = "mediatek,mt2701-mmsys", > > .data = &mt2701_mmsys_driver_data}, > > @@ -271,6 +287,8 @@ static const struct of_device_id > > mtk_drm_of_ids[] > > = { > > .data = &mt8192_mmsys_driver_data}, > > { .compatible = "mediatek,mt8195-vdosys0", > > .data = &mt8195_vdosys0_driver_data}, > > + { .compatible = "mediatek,mt8195-vdosys1", > > + .data = &mt8195_vdosys1_driver_data}, > > { } > > }; > > MODULE_DEVICE_TABLE(of, mtk_drm_of_ids); > >
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 36430f956b4f..e851c56f00b1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -190,6 +190,14 @@ static const enum mtk_ddp_comp_id mt8195_mtk_ddp_main[] = { DDP_COMPONENT_DP_INTF0, }; +static const enum mtk_ddp_comp_id mt8195_mtk_ddp_ext[] = { + DDP_COMPONENT_OVL_ADAPTOR, + DDP_COMPONENT_MERGE5, + DDP_COMPONENT_DP_INTF1, +}; + +static const int mt8195_vdosys1_mtk_cmdq_mbox[] = {-1, 0, -1}; + 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), @@ -254,6 +262,14 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = { .mmsys_dev_num = 2, }; +static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = { + .ext_path = mt8195_mtk_ddp_ext, + .ext_len = ARRAY_SIZE(mt8195_mtk_ddp_ext), + .mmsys_id = 1, + .mmsys_dev_num = 2, + .mbox_index = mt8195_vdosys1_mtk_cmdq_mbox, +}; + static const struct of_device_id mtk_drm_of_ids[] = { { .compatible = "mediatek,mt2701-mmsys", .data = &mt2701_mmsys_driver_data}, @@ -271,6 +287,8 @@ static const struct of_device_id mtk_drm_of_ids[] = { .data = &mt8192_mmsys_driver_data}, { .compatible = "mediatek,mt8195-vdosys0", .data = &mt8195_vdosys0_driver_data}, + { .compatible = "mediatek,mt8195-vdosys1", + .data = &mt8195_vdosys1_driver_data}, { } }; MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);
Add driver data of mt8195 vdosys1 to mediatek-drm. Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)