Re: [PATCH v7 3/4] drm/mediatek: Add ability to support dynamic connector selection

Jason-JH Lin (林睿祥)
2023-08-02T05:59:45Z

Hi CK,

Thanks for the reviews.

On Mon, 2023-07-31 at 06:37 +0000, CK Hu (胡俊光) wrote:
> Hi, Jason:
>
> On Fri, 2023-07-28 at 00:41 +0800, 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@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 | 75
> > ++++++++++++++++++++-
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 5 +-
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 26 +++++++
> > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 8 +++
> > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 20 ++++--
> > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 7 ++
> > 8 files changed, 145 insertions(+), 6 deletions(-)
> >

snip...

> > +static int mtk_drm_crtc_update_output(struct drm_crtc *crtc,
> > + struct drm_atomic_state *state)
>
> this function always return 0, so let the return type void.
>
OK, I'll change to void.

> > +{
> > + 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;
> > +
> > + if (!mtk_crtc->num_conn_routes)
> > + 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->num_conn_routes; i++) {
> > + comp_id = conn_routes[i].route_ddp;
> > + if (priv->comp_node[comp_id] &&

See mtk_drm_crtc_create() reply below first, then see the reply here:
Since we could have invalid encoder_index = -1 assigned in
mtk_drm_crtc_create(), I'll add an encoder_index >= 0 condition here.

> > + encoder_mask & BIT(priv-
> > > ddp_comp[comp_id].encoder_index)) {
> >
> > + struct mtk_ddp_comp *comp = &priv-
> > > ddp_comp[comp_id];
> >
> > +
> > + mtk_crtc->ddp_comp[mtk_crtc->ddp_comp_nr - 1] =
> > comp;
> > + dev_dbg(dev, "Add comp_id: %d at path index
> > %d\n",
> > + comp->id, mtk_crtc->ddp_comp_nr - 1);
> > + break;
> > + }
> > + }
> > +
> > + dev_dbg(dev, "Update total comp num:%d", mtk_crtc-
> > > ddp_comp_nr);
> >
> > +
> > + return 0;
> > +}
> > +

snip...

> > 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 num_conn_routes)
> > {
> > struct mtk_drm_private *priv = drm_dev->dev_private;
> > struct device *dev = drm_dev->dev;
> > @@ -937,6 +990,26 @@ int mtk_drm_crtc_create(struct drm_device
> > *drm_dev,
> >
> > mtk_crtc->mmsys_dev = priv->mmsys_dev;
> > mtk_crtc->ddp_comp_nr = path_len;
> > + if (conn_routes) {
> > + struct device_node *node;
> > + struct mtk_ddp_comp *comp;
> > + unsigned int comp_id;
> > +
> > + for (i = 0; i < num_conn_routes; i++) {
> > + comp_id = conn_routes[i].route_ddp;
> > + node = priv->comp_node[comp_id];
> > + comp = &priv->ddp_comp[comp_id];
> > + if (!comp) {
> > + dev_err(dev, "Component %pOF not
> > initialized\n", node);
> > + return -ENODEV;
> > + }
> > + mtk_ddp_comp_encoder_index_set(comp);
> > + }
>
> move this device initialization checking after the device
> initialization checking of priv->comp_node[].
>
I found that we should give the invalid encoder_index to each ddp_comp,
if comp->dev doesn't exist.

Otherwise, their encoder_index will be set as 0, which is the valid bit
to encoder_mask in mtk_drm_update_output().

So I'll move this device initialization checking before
mtk_ddp_comp_encoder_index_set(comp) and set encoder_index = -1 when
device checking is failed.

> > +
> > + mtk_crtc->num_conn_routes = num_conn_routes;
> > + mtk_crtc->conn_routes = conn_routes;
> > + mtk_crtc->ddp_comp_nr++;
>
> You add ddp_comp_nr here, but later many for-loop would access
> ddp_comp[ddp_comp_nr - 1]. This is an invalid access. You may
> increase
> ddp_comp_nr in the end of this function.
>

OK, I will move this conn_routes statement to the end of this function.

Regards
Jason-JH.Lin

> Regards,
> CK
>
> > + }
> > mtk_crtc->ddp_comp = devm_kmalloc_array(dev, mtk_crtc-
> > > ddp_comp_nr,
> >
> > sizeof(*mtk_crtc-
> > > ddp_comp),
> >
> > GFP_KERNEL);
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> > index 3e9046993d09..3c224595fa71 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 num_conn_routes);
> > 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..bc7b0a0c20db 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> > @@ -304,6 +304,7 @@ static const struct mtk_ddp_comp_funcs
> > ddp_dither
> > = {
> > static const struct mtk_ddp_comp_funcs ddp_dpi = {
> > .start = mtk_dpi_start,
> > .stop = mtk_dpi_stop,
> > + .encoder_index = mtk_dpi_encoder_index,
> > };
> >
> > static const struct mtk_ddp_comp_funcs ddp_dsc = {
> > @@ -507,6 +508,25 @@ static bool mtk_drm_find_comp_in_ddp(struct
> > device *dev,
> > return false;
> > }
> >
> > +static int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,
> > + const struct
> > mtk_drm_route *routes,
> > + unsigned int routes_num,
> > + struct mtk_ddp_comp
> > *ddp_comp)
> > +{
> > + unsigned int i;
> > +
> > + if (!routes)
> > + return 0;
> > +
> > + for (i = 0; i < routes_num; i++)
> > + if (dev == ddp_comp[routes[i].route_ddp].dev)
> > + return BIT(routes[i].crtc_id);
> > +
> > + DRM_INFO("Failed to find comp in ddp connector table\n");
> > +
> > + return 0;
> > +}
> > +
> > int mtk_ddp_comp_get_id(struct device_node *node,
> > enum mtk_ddp_comp_type comp_type)
> > {
> > @@ -538,6 +558,12 @@ unsigned int
> > mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,
> > private->data->third_len,
> > private->ddp_comp))
> > ret = BIT(2);
> > else
> > + ret = mtk_drm_find_comp_in_ddp_conn_path(dev,
> > + private->data-
> > > conn_routes,
> >
> > + private->data-
> > > num_conn_routes,
> >
> > + private-
> > > ddp_comp);
> >
> > +
> > + if (ret == 0)
> > DRM_INFO("Failed to find comp in ddp table\n");
> >
> > return ret;
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> > index febcaeef16a1..8428baca70f4 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);
> > + unsigned int (*encoder_index)(struct device *dev);
> > };
> >
> > struct mtk_ddp_comp {
> > @@ -87,6 +88,7 @@ struct mtk_ddp_comp {
> > int irq;
> > unsigned int id;
> > const struct mtk_ddp_comp_funcs *funcs;
> > + unsigned int encoder_index;
> > };
> >
> > static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp
> > *comp)
> > @@ -275,6 +277,12 @@ static inline bool
> > mtk_ddp_comp_disconnect(struct mtk_ddp_comp *comp, struct dev
> > return false;
> > }
> >
> > +static inline void mtk_ddp_comp_encoder_index_set(struct
> > mtk_ddp_comp *comp)
> > +{
> > + if (comp->funcs && comp->funcs->encoder_index)
> > + comp->encoder_index = comp->funcs->encoder_index(comp-
> > > dev);
> >
> > +}
> > +
> > int mtk_ddp_comp_get_id(struct device_node *node,
> > enum mtk_ddp_comp_type comp_type);
> > unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device
> > *drm,
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > index d2fb1fb4e682..ecd113f9908c 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> > @@ -185,7 +185,10 @@ static const unsigned int
> > mt8188_mtk_ddp_main[]
> > = {
> > DDP_COMPONENT_GAMMA,
> > DDP_COMPONENT_POSTMASK0,
> > DDP_COMPONENT_DITHER0,
> > - DDP_COMPONENT_DP_INTF0,
> > +};
> > +
> > +static const struct mtk_drm_route mt8188_mtk_ddp_main_routes[] = {
> > + {0, DDP_COMPONENT_DP_INTF0},
> > };
> >
> > static const unsigned int mt8192_mtk_ddp_main[] = {
> > @@ -287,6 +290,8 @@ static const struct mtk_mmsys_driver_data
> > mt8186_mmsys_driver_data = {
> > static const struct mtk_mmsys_driver_data
> > mt8188_vdosys0_driver_data
> > = {
> > .main_path = mt8188_mtk_ddp_main,
> > .main_len = ARRAY_SIZE(mt8188_mtk_ddp_main),
> > + .conn_routes = mt8188_mtk_ddp_main_routes,
> > + .num_conn_routes = ARRAY_SIZE(mt8188_mtk_ddp_main_routes),
> > .mmsys_dev_num = 1,
> > };
> >
> > @@ -419,6 +424,11 @@ static bool mtk_drm_find_mmsys_comp(struct
> > mtk_drm_private *private, int comp_id
> > if (drv_data->third_path[i] == comp_id)
> > return true;
> >
> > + if (drv_data->num_conn_routes)
> > + for (i = 0; i < drv_data->num_conn_routes; i++)
> > + if (drv_data->conn_routes[i].route_ddp ==
> > comp_id)
> > + return true;
> > +
> > return false;
> > }
> >
> > @@ -477,21 +487,23 @@ static int mtk_drm_kms_init(struct drm_device
> > *drm)
> >
> > if (i == 0 && priv_n->data->main_len) {
> > ret = mtk_drm_crtc_create(drm, priv_n-
> > > data->main_path,
> >
> > - priv_n->data-
> > > main_len, j);
> >
> > + priv_n->data-
> > > main_len, j,
> >
> > + priv_n->data-
> > > conn_routes,
> >
> > + priv_n->data-
> > > num_conn_routes);
> >
> > if (ret)
> > goto err_component_unbind;
> >
> > continue;
> > } else if (i == 1 && priv_n->data->ext_len) {
> > ret = mtk_drm_crtc_create(drm, priv_n-
> > > data->ext_path,
> >
> > - priv_n->data-
> > > ext_len, j);
> >
> > + priv_n->data-
> > > ext_len, j, NULL, 0);
> >
> > if (ret)
> > goto err_component_unbind;
> >
> > continue;
> > } else if (i == 2 && priv_n->data->third_len) {
> > ret = mtk_drm_crtc_create(drm, priv_n-
> > > data->third_path,
> >
> > - priv_n->data-
> > > third_len, j);
> >
> > + priv_n->data-
> > > third_len, j, NULL, 0);
> >
> > if (ret)
> > goto err_component_unbind;
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> > b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> > index eb2fd45941f0..39697a591046 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
> > @@ -22,6 +22,11 @@ struct drm_fb_helper;
> > struct drm_property;
> > struct regmap;
> >
> > +struct mtk_drm_route {
> > + const unsigned int crtc_id;
> > + const unsigned int route_ddp;
> > +};
> > +
> > struct mtk_mmsys_driver_data {
> > const unsigned int *main_path;
> > unsigned int main_len;
> > @@ -29,6 +34,8 @@ struct mtk_mmsys_driver_data {
> > unsigned int ext_len;
> > const unsigned int *third_path;
> > unsigned int third_len;
> > + const struct mtk_drm_route *conn_routes;
> > + unsigned int num_conn_routes;
> >
> > bool shadow_register;
> > unsigned int mmsys_id;