| Message ID | 20230727164114.20638-5-jason-jh.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add dynamic connector selection mechanism | expand |
Il 27/07/23 18:41, Jason-JH.Lin ha scritto: > Add DSI as main display output for mt8188 vdosys0. > I would split this commit in two: 1. drm/mediatek: dsi: Support dynamic connector selection 2. drm/mediatek: Support DSI on MT8188 VDOSYS0 Where the first one sets up the mtk_dsi driver for .encoder_index(), and where the second one is a one-liner simply adding `{0, DDP_COMPONENT_DSI0},` to the MT8188 main routes array. The reason is that if you split it like that, whoever reads the commit history will immediately understand how to add dynamic connector selection to a MTK DRM driver, and how to perform the SoC-specific connection.... Please! Thanks, Angelo > Signed-off-by: Nathan Lu <nathan.lu@mediatek.com> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > --- > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 1 + > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 + > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 1 + > drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +++++++++ > 4 files changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index 5f07037670e9..fdaa21b6a9da 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -48,6 +48,7 @@ unsigned int mtk_dpi_encoder_index(struct device *dev); > > void mtk_dsi_ddp_start(struct device *dev); > void mtk_dsi_ddp_stop(struct device *dev); > +unsigned int mtk_dsi_encoder_index(struct device *dev); > > int mtk_gamma_clk_enable(struct device *dev); > void mtk_gamma_clk_disable(struct device *dev); > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index bc7b0a0c20db..e6a7a0b9de6c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -318,6 +318,7 @@ static const struct mtk_ddp_comp_funcs ddp_dsc = { > static const struct mtk_ddp_comp_funcs ddp_dsi = { > .start = mtk_dsi_ddp_start, > .stop = mtk_dsi_ddp_stop, > + .encoder_index = mtk_dsi_encoder_index, > }; > > static const struct mtk_ddp_comp_funcs ddp_gamma = { > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index ecd113f9908c..9b7ca8d35f71 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -189,6 +189,7 @@ static const unsigned int mt8188_mtk_ddp_main[] = { > > static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = { > {0, DDP_COMPONENT_DP_INTF0}, > + {0, DDP_COMPONENT_DSI0}, > }; > > static const unsigned int mt8192_mtk_ddp_main[] = { > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 7d5250351193..62d5362916a5 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -865,6 +865,15 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi) > return ret; > } > > +unsigned int mtk_dsi_encoder_index(struct device *dev) > +{ > + struct mtk_dsi *dsi = dev_get_drvdata(dev); > + unsigned int encoder_index = drm_encoder_index(&dsi->encoder); > + > + dev_dbg(dev, "encoder index:%d", encoder_index); > + return encoder_index; > +} > + > static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) > { > int ret;
Hi Angelo, Thanks for the reviews. On Fri, 2023-07-28 at 10:14 +0200, AngeloGioacchino Del Regno wrote: > Il 27/07/23 18:41, Jason-JH.Lin ha scritto: > > Add DSI as main display output for mt8188 vdosys0. > > > > I would split this commit in two: > > 1. drm/mediatek: dsi: Support dynamic connector selection > 2. drm/mediatek: Support DSI on MT8188 VDOSYS0 > OK, I'll separate this commit like this. Regards, Jason-JH.Lin > Where the first one sets up the mtk_dsi driver for .encoder_index(), > and > where the second one is a one-liner simply adding `{0, > DDP_COMPONENT_DSI0},` > to the MT8188 main routes array. > > The reason is that if you split it like that, whoever reads the > commit history > will immediately understand how to add dynamic connector selection to > a MTK DRM > driver, and how to perform the SoC-specific connection.... > > Please! > > Thanks, > Angelo >
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h index 5f07037670e9..fdaa21b6a9da 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h @@ -48,6 +48,7 @@ unsigned int mtk_dpi_encoder_index(struct device *dev); void mtk_dsi_ddp_start(struct device *dev); void mtk_dsi_ddp_stop(struct device *dev); +unsigned int mtk_dsi_encoder_index(struct device *dev); int mtk_gamma_clk_enable(struct device *dev); void mtk_gamma_clk_disable(struct device *dev); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index bc7b0a0c20db..e6a7a0b9de6c 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -318,6 +318,7 @@ static const struct mtk_ddp_comp_funcs ddp_dsc = { static const struct mtk_ddp_comp_funcs ddp_dsi = { .start = mtk_dsi_ddp_start, .stop = mtk_dsi_ddp_stop, + .encoder_index = mtk_dsi_encoder_index, }; static const struct mtk_ddp_comp_funcs ddp_gamma = { diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index ecd113f9908c..9b7ca8d35f71 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -189,6 +189,7 @@ static const unsigned int mt8188_mtk_ddp_main[] = { static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = { {0, DDP_COMPONENT_DP_INTF0}, + {0, DDP_COMPONENT_DSI0}, }; static const unsigned int mt8192_mtk_ddp_main[] = { diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 7d5250351193..62d5362916a5 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -865,6 +865,15 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi) return ret; } +unsigned int mtk_dsi_encoder_index(struct device *dev) +{ + struct mtk_dsi *dsi = dev_get_drvdata(dev); + unsigned int encoder_index = drm_encoder_index(&dsi->encoder); + + dev_dbg(dev, "encoder index:%d", encoder_index); + return encoder_index; +} + static int mtk_dsi_bind(struct device *dev, struct device *master, void *data) { int ret;