| Message ID | 20231123133749.2030661-5-mwalle@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | drm/mediatek: support DSI output on MT8195 | expand |
> With the latest dynamic selection of the output component, we can now > support different outputs. Move current output component into the > dynamic routes array and add the new DSI0 output. > > Signed-off-by: Michael Walle <mwalle@kernel.org> > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 2b0c35cacbc6..6fa88976376e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -222,7 +222,11 @@ static const unsigned int mt8195_mtk_ddp_main[] = > { > DDP_COMPONENT_DITHER0, > DDP_COMPONENT_DSC0, > DDP_COMPONENT_MERGE0, > - DDP_COMPONENT_DP_INTF0, Please disregard this patch (the others are ok). There must gone something wrong during my testing. DDP_COMPONENT_MERGE0 won't work with DDP_COMPONENT_DSI0. If anyone has more insights, I'm all ears. -michael > +}; > + > +static const struct mtk_drm_route mt8195_mtk_ddp_main_routes[] = { > + { 0, DDP_COMPONENT_DP_INTF0 }, > + { 0, DDP_COMPONENT_DSI0 }, > }; > > static const unsigned int mt8195_mtk_ddp_ext[] = { > @@ -308,6 +312,8 @@ static const struct mtk_mmsys_driver_data > mt8192_mmsys_driver_data = { > 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), > + .conn_routes = mt8195_mtk_ddp_main_routes, > + .num_conn_routes = ARRAY_SIZE(mt8195_mtk_ddp_main_routes), > .mmsys_dev_num = 2, > };
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 2b0c35cacbc6..6fa88976376e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -222,7 +222,11 @@ static const unsigned int mt8195_mtk_ddp_main[] = { DDP_COMPONENT_DITHER0, DDP_COMPONENT_DSC0, DDP_COMPONENT_MERGE0, - DDP_COMPONENT_DP_INTF0, +}; + +static const struct mtk_drm_route mt8195_mtk_ddp_main_routes[] = { + { 0, DDP_COMPONENT_DP_INTF0 }, + { 0, DDP_COMPONENT_DSI0 }, }; static const unsigned int mt8195_mtk_ddp_ext[] = { @@ -308,6 +312,8 @@ static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { 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), + .conn_routes = mt8195_mtk_ddp_main_routes, + .num_conn_routes = ARRAY_SIZE(mt8195_mtk_ddp_main_routes), .mmsys_dev_num = 2, };
With the latest dynamic selection of the output component, we can now support different outputs. Move current output component into the dynamic routes array and add the new DSI0 output. Signed-off-by: Michael Walle <mwalle@kernel.org> --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)