| Message ID | 20240226085059.26850-11-shawn.sung@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rename mtk_drm_* to mtk_* | expand |
Il 26/02/24 09:50, Shawn Sung ha scritto: > From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> > > Rename functions of mtk_ddp_comp: > - To align the naming rule > - To reduce the code size > > Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> Reviewed-by: AngeloGiaocchino Del Regno <angelogioacchino.delregno@collabora.com>
Hi, Shawn: On Mon, 2024-02-26 at 16:50 +0800, Shawn Sung wrote: > From: Hsiao Chien Sung <shawn.sung@mediatek.corp-partner.google.com> > > Rename functions of mtk_ddp_comp: > - To align the naming rule > - To reduce the code size Reviewed-by: CK Hu <ck.hu@mediatek.com> > > Signed-off-by: Hsiao Chien Sung < > shawn.sung@mediatek.corp-partner.google.com> > --- > drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 45 ++++++++++++++--------- > -- > drivers/gpu/drm/mediatek/mtk_ddp_comp.h | 3 +- > drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- > drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- > 4 files changed, 28 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > index ab846a9f98c5..f6d482d27c63 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > @@ -497,10 +497,10 @@ static const struct mtk_ddp_comp_match > mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] > [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, > 1, NULL }, > }; > > -static bool mtk_drm_find_comp_in_ddp(struct device *dev, > - const unsigned int *path, > - unsigned int path_len, > - struct mtk_ddp_comp *ddp_comp) > +static bool mtk_ddp_comp_find(struct device *dev, > + const unsigned int *path, > + unsigned int path_len, > + struct mtk_ddp_comp *ddp_comp) > { > unsigned int i; > > @@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct > device *dev, > return false; > } > > -static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device > *dev, > - const struct > mtk_drm_route *routes, > - unsigned int > num_routes, > - struct > mtk_ddp_comp *ddp_comp) > +static unsigned int mtk_ddp_comp_find_in_route(struct device *dev, > + const struct > mtk_drm_route *routes, > + unsigned int num_routes, > + struct mtk_ddp_comp > *ddp_comp) > { > int ret; > unsigned int i; > @@ -554,26 +554,31 @@ int mtk_ddp_comp_get_id(struct device_node > *node, > return -EINVAL; > } > > -unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device > *drm, > - struct device *dev) > +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct > device *dev) > { > struct mtk_drm_private *private = drm->dev_private; > unsigned int ret = 0; > > - if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, > private->data->main_len, > - private->ddp_comp)) > + if (mtk_ddp_comp_find(dev, > + private->data->main_path, > + private->data->main_len, > + private->ddp_comp)) > ret = BIT(0); > - else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, > - private->data->ext_len, > private->ddp_comp)) > + else if (mtk_ddp_comp_find(dev, > + private->data->ext_path, > + private->data->ext_len, > + private->ddp_comp)) > ret = BIT(1); > - else if (mtk_drm_find_comp_in_ddp(dev, private->data- > >third_path, > - private->data->third_len, > private->ddp_comp)) > + else if (mtk_ddp_comp_find(dev, > + private->data->third_path, > + 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); > + ret = mtk_ddp_comp_find_in_route(dev, > + private->data- > >conn_routes, > + private->data- > >num_conn_routes, > + private->ddp_comp); > > return ret; > } > diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h > b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h > index ba985206fdd2..26236691ce4c 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h > +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h > @@ -326,8 +326,7 @@ static inline void > mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp) > > 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, > - struct device *dev); > +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct > device *dev); > int mtk_ddp_comp_init(struct device_node *comp_node, struct > mtk_ddp_comp *comp, > unsigned int comp_id); > enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id); > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c > b/drivers/gpu/drm/mediatek/mtk_dpi.c > index 84745ec9dd7c..0c83a4400088 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -805,7 +805,7 @@ static int mtk_dpi_bind(struct device *dev, > struct device *master, void *data) > return ret; > } > > - dpi->encoder.possible_crtcs = > mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev); > + dpi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm_dev, > dpi->dev); > > ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, > DRM_BRIDGE_ATTACH_NO_CONNECTOR); > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c > b/drivers/gpu/drm/mediatek/mtk_dsi.c > index a9071c4dce0e..811b7305668f 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -836,7 +836,7 @@ static int mtk_dsi_encoder_init(struct drm_device > *drm, struct mtk_dsi *dsi) > return ret; > } > > - dsi->encoder.possible_crtcs = > mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev); > + dsi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm, dsi- > >host.dev); > > ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, > DRM_BRIDGE_ATTACH_NO_CONNECTOR);
diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c index ab846a9f98c5..f6d482d27c63 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c @@ -497,10 +497,10 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, 1, NULL }, }; -static bool mtk_drm_find_comp_in_ddp(struct device *dev, - const unsigned int *path, - unsigned int path_len, - struct mtk_ddp_comp *ddp_comp) +static bool mtk_ddp_comp_find(struct device *dev, + const unsigned int *path, + unsigned int path_len, + struct mtk_ddp_comp *ddp_comp) { unsigned int i; @@ -514,10 +514,10 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev, return false; } -static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev, - const struct mtk_drm_route *routes, - unsigned int num_routes, - struct mtk_ddp_comp *ddp_comp) +static unsigned int mtk_ddp_comp_find_in_route(struct device *dev, + const struct mtk_drm_route *routes, + unsigned int num_routes, + struct mtk_ddp_comp *ddp_comp) { int ret; unsigned int i; @@ -554,26 +554,31 @@ int mtk_ddp_comp_get_id(struct device_node *node, return -EINVAL; } -unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm, - struct device *dev) +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev) { struct mtk_drm_private *private = drm->dev_private; unsigned int ret = 0; - if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, private->data->main_len, - private->ddp_comp)) + if (mtk_ddp_comp_find(dev, + private->data->main_path, + private->data->main_len, + private->ddp_comp)) ret = BIT(0); - else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path, - private->data->ext_len, private->ddp_comp)) + else if (mtk_ddp_comp_find(dev, + private->data->ext_path, + private->data->ext_len, + private->ddp_comp)) ret = BIT(1); - else if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path, - private->data->third_len, private->ddp_comp)) + else if (mtk_ddp_comp_find(dev, + private->data->third_path, + 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); + ret = mtk_ddp_comp_find_in_route(dev, + private->data->conn_routes, + private->data->num_conn_routes, + private->ddp_comp); return ret; } diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h index ba985206fdd2..26236691ce4c 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.h @@ -326,8 +326,7 @@ static inline void mtk_ddp_comp_encoder_index_set(struct mtk_ddp_comp *comp) 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, - struct device *dev); +unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev); int mtk_ddp_comp_init(struct device_node *comp_node, struct mtk_ddp_comp *comp, unsigned int comp_id); enum mtk_ddp_comp_type mtk_ddp_comp_get_type(unsigned int comp_id); diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 84745ec9dd7c..0c83a4400088 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -805,7 +805,7 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) return ret; } - dpi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->dev); + dpi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm_dev, dpi->dev); ret = drm_bridge_attach(&dpi->encoder, &dpi->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR); diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index a9071c4dce0e..811b7305668f 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -836,7 +836,7 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi) return ret; } - dsi->encoder.possible_crtcs = mtk_drm_find_possible_crtc_by_comp(drm, dsi->host.dev); + dsi->encoder.possible_crtcs = mtk_find_possible_crtcs(drm, dsi->host.dev); ret = drm_bridge_attach(&dsi->encoder, &dsi->bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);