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

["Jason-JH Lin (林睿祥)" <Jason-JH.Lin@mediatek.com>]

Hi Angelo,

Thanks for the review and sorry for the late reply.


On Thu, 2023-05-18 at 11:29 +0200, AngeloGioacchino Del Regno wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Il 09/05/23 17:07, Jason-JH.Lin ha scritto:
> > 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@mediatek.com>
> > Signed-off-by: Nathan Lu <nathan.lu@mediatek.com>
> > Signed-off-by: Jason-JH.Lin <jason-jh.lin@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     | 111
> > +++++++++++++++++++-
> >   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, 202 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..54d48932b833 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;
> 
> `num_conn_routes` is clearer.
> 
OK, I'll modify it.

> > +     const struct mtk_drm_route      *conn_routes;
> > 
> >       /* lock for display hardware access */
> >       struct mutex                    hw_lock;
> > @@ -649,6 +653,84 @@ 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++)
> > +             max_num = max(mtk_crtc->conn_routes[i].route_len,
> > max_num);
> 
> If we rename this to `num_routes` or `max_routes` it becomes a bit
> more
> understandable.
> 
OK, I'll modify it.

> > +
> > +     return max_num;
> > +}
> > +
> > +static int mtk_drm_crtc_update_output(struct drm_crtc *crtc,
> > +                                   struct drm_atomic_state *state)
> > +{
> > +     const struct mtk_drm_route *conn_routes;
> > +     int crtc_index = drm_crtc_index(crtc);
> > +     int i;
> > +     struct device *dev;
> > +     struct drm_crtc_state *crtc_state = state-
> > >crtcs[crtc_index].new_state;
> > +     struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> > +     struct mtk_drm_private *priv = crtc->dev->dev_private;
> > +     unsigned int comp_id;
> > +     unsigned int encoder_mask = crtc_state->encoder_mask;
> > +     unsigned int route_len = 0, route_index = 0;
> > +
> > +     if (!mtk_crtc->conn_route_nr)
> > +             return 0;
> > +
> > +     priv = priv->all_drm_private[crtc_index];
> > +     dev = priv->dev;
> > +
> > +     dev_dbg(dev, "connector change:%d, encoder mask0x%x for
> > crtc%d",
> > +             crtc_state->connectors_changed, encoder_mask,
> > crtc_index);
> > +
> > +     if (!crtc_state->connectors_changed)
> > +             return 0;
> > +
> > +     conn_routes = mtk_crtc->conn_routes;
> > +
> > +     for (i = 0; i < mtk_crtc->conn_route_nr; i++) {
> > +             route_len = conn_routes[i].route_len;
> > +             if (route_len > 0) {
> 
> route_len is unsigned, it can never be < 0, so...
> 
>                 if (route_len) {
> 
It's better to use unsigned int.
I'll modify it.

> > +                     comp_id = conn_routes[i].route_ddp[route_len
> > - 1];
> > +                     if (priv->comp_node[comp_id]) {
> > +                             if ((1 << priv-
> > >ddp_comp[comp_id].encoder_index) == encoder_mask) {
> 
> This is effectively BIT().
> 
> if (encoder_mask == BIT(priv->ddp_comp[comp_id].encoder_index)) {
> 
> P.S.: Are you sure that this shouldn't be (encoder_mask &
> BIT(encoder_index))??
> 
Yes, encoder_index should be bitwise. I'll fixed it.

> > +                                     route_index = i;
> > +                                     break;
> > +                             }
> > +                     }
> > +             }
> > +     }
> > +
> 
> ..snip..
> 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > index 3e9046993d09..672b9c7afee6 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > @@ -8,6 +8,7 @@
> > 
> >   #include <drm/drm_crtc.h>
> >   #include "mtk_drm_ddp_comp.h"
> > +#include "mtk_drm_drv.h"
> >   #include "mtk_drm_plane.h"
> > 
> >   #define MTK_LUT_SIZE        512
> > @@ -18,7 +19,9 @@ void mtk_drm_crtc_commit(struct drm_crtc *crtc);
> >   int mtk_drm_crtc_create(struct drm_device *drm_dev,
> >                       const unsigned int *path,
> >                       unsigned int path_len,
> > -                     int priv_data_index);
> > +                     int priv_data_index,
> > +                     const struct mtk_drm_route *conn_routes,
> > +                     unsigned int conn_routes_num);
> 
> num_conn_routes looks better.

OK, I'll modify it.
> 
> >   int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct
> > drm_plane *plane,
> >                            struct mtk_plane_state *state);
> >   void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct
> > drm_plane *plane,
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > index f114da4d36a9..fe20ce26b19f 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> 
> ..snip..
> 
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > index febcaeef16a1..1c1d670cfe41 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > @@ -80,6 +80,7 @@ struct mtk_ddp_comp_funcs {
> >       void (*disconnect)(struct device *dev, struct device
> > *mmsys_dev, unsigned int next);
> >       void (*add)(struct device *dev, struct mtk_mutex *mutex);
> >       void (*remove)(struct device *dev, struct mtk_mutex *mutex);
> > +     int (*encoder_index)(struct device *dev);
> 
> drm_encoder_index returns an unsigned int type, so this one can never
> be negative:
> please change the return value of this function to unsigned int type.
> 
OK, I'll modify it.

> >   };
> > 
> >   struct mtk_ddp_comp {
> > @@ -87,6 +88,7 @@ struct mtk_ddp_comp {
> >       int irq;
> >       unsigned int id;
> >       const struct mtk_ddp_comp_funcs *funcs;
> > +     int encoder_index;
> 
> Same here, unsigned int.
> 
OK, I'll modify it.

Regards,
Jason-JH.Lin

> >   };
> > 
> >   static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp
> > *comp)
> 
> Regards,
> Angelo
> 
>