[PATCH v2 1/2] drm/mediatek: Add ability to support dynamic connector selection

[Jason-JH Lin (林睿祥)]

An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230509/43299679/attachment-0001.htm>
-------------- next part --------------
Hi Matthias,

Thanks for the reviews.

On Thu, 2023-04-27 at 14:17 +0200, Matthias Brugger wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> On 27/04/2023 10:40, Jason-JH.Lin wrote:
> > 1. Move output drm connector from each ddp_path array to connector
> > array.
> > 2. Add dynamic select available connector flow in crtc create and
> > enable.
> > 
> > Signed-off-by: Nancy Lin <nancy.lin at mediatek.com>
> > Signed-off-by: Nathan Lu <nathan.lu at mediatek.com>
> > Signed-off-by: Jason-JH.Lin <jason-jh.lin at mediatek.com>
> > ---
> >   drivers/gpu/drm/mediatek/mtk_disp_drv.h     |   1 +
> >   drivers/gpu/drm/mediatek/mtk_dpi.c          |   9 ++
> >   drivers/gpu/drm/mediatek/mtk_drm_crtc.c     | 112
> > +++++++++++++++++++-
> >   drivers/gpu/drm/mediatek/mtk_drm_crtc.h     |   5 +-
> >   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c |  27 +++++
> >   drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h |   8 ++
> >   drivers/gpu/drm/mediatek/mtk_drm_drv.c      |  44 ++++++--
> >   drivers/gpu/drm/mediatek/mtk_drm_drv.h      |   8 ++
> >   8 files changed, 203 insertions(+), 11 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > index 2254038519e1..72c57442f965 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> > @@ -44,6 +44,7 @@ void mtk_dither_set_common(void __iomem *regs,
> > struct cmdq_client_reg *cmdq_reg,
> > 
> >   void mtk_dpi_start(struct device *dev);
> >   void mtk_dpi_stop(struct device *dev);
> > +int mtk_dpi_encoder_index(struct device *dev);
> > 
> >   void mtk_dsi_ddp_start(struct device *dev);
> >   void mtk_dsi_ddp_stop(struct device *dev);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > index 948a53f1f4b3..765fc976e41f 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > @@ -782,6 +782,15 @@ void mtk_dpi_stop(struct device *dev)
> >       mtk_dpi_power_off(dpi);
> >   }
> > 
> > +int mtk_dpi_encoder_index(struct device *dev)
> > +{
> > +     struct mtk_dpi *dpi = dev_get_drvdata(dev);
> > +     int encoder_index = drm_encoder_index(&dpi->encoder);
> > +
> > +     dev_dbg(dev, "encoder index:%d", encoder_index);
> > +     return encoder_index;
> > +}
> > +
> >   static int mtk_dpi_bind(struct device *dev, struct device
> > *master, void *data)
> >   {
> >       struct mtk_dpi *dpi = dev_get_drvdata(dev);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index d40142842f85..2bafd377dcf4 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -60,8 +60,12 @@ struct mtk_drm_crtc {
> >       struct device                   *mmsys_dev;
> >       struct device                   *dma_dev;
> >       struct mtk_mutex                *mutex;
> > +     unsigned int                    ddp_comp_nr_ori;
> > +     unsigned int                    max_ddp_comp_nr;
> >       unsigned int                    ddp_comp_nr;
> >       struct mtk_ddp_comp             **ddp_comp;
> > +     unsigned int                    conn_route_nr;
> > +     const struct mtk_drm_route      *conn_routes;
> > 
> >       /* lock for display hardware access */
> >       struct mutex                    hw_lock;
> > @@ -649,6 +653,85 @@ static void mtk_drm_crtc_disable_vblank(struct
> > drm_crtc *crtc)
> >       mtk_ddp_comp_disable_vblank(comp);
> >   }
> > 
> > +static unsigned int mtk_drm_crtc_max_num_route_comp(struct
> > mtk_drm_crtc *mtk_crtc)
> > +{
> > +     unsigned int max_num = 0;
> > +     unsigned int i;
> > +
> > +     if (!mtk_crtc->conn_route_nr)
> > +             return 0;
> > +
> > +     for (i = 0; i < mtk_crtc->conn_route_nr; i++)
> > +             if (max_num < mtk_crtc->conn_routes[i].route_len)
> > +                     max_num = mtk_crtc->conn_routes[i].route_len;
> 
> max_num = max(mtk_crtc->conn_routes[i].route_len, max_num);
> 
> Regards,
> Matthias
> 

OK I'll modify it.

Regard,
Jason-JH.Lin