The mtk_ddp_comp_type enumeration will end up containing both the Display Controller and Media Data Path Controller components: this is because those can be interconnected together (as in, using MDP components in Display Controller paths is possible!) and because both MMSYS and MuteX are managing both of those in practically the same way.
Rename all of the Display Controller related HW components in the list to always have a "DISP_" prefix. This includes components that are in the MDP Controller instead, and the strategy here is for some of those to also have the same DISP_ prefix, so that: - Display Controller specific components have a DISP_ prefix - Example: MTK_DISP_(NAME) - MDP Controller components that can be interconnected to the Display Controller will have both DISP_ and MDP_ prefixes - Example: MTK_DISP_MDP_(NAME) - MDP Controller components that are exclusive to MDP and can not be interconnected with Display Controller will only have an MDP_ prefix but not a DISP_ prefix - Example: MTK_MDP_(NAME). Signed-off-by: AngeloGioacchino Del Regno <[email protected]> --- drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 28 +++++++++---------- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 36 ++++++++++++------------- include/linux/soc/mediatek/mtk-mmsys.h | 6 ++--- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c index 94b356da6de7..a6c1815ffa39 100644 --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c @@ -423,9 +423,9 @@ static const char * const mtk_ddp_comp_stem[MTK_DDP_COMP_TYPE_MAX] = { [MTK_DISP_RDMA] = "rdma", [MTK_DISP_UFOE] = "ufoe", [MTK_DISP_WDMA] = "wdma", - [MTK_DP_INTF] = "dp-intf", - [MTK_DPI] = "dpi", - [MTK_DSI] = "dsi", + [MTK_DISP_DP_INTF] = "dp-intf", + [MTK_DISP_DPI] = "dpi", + [MTK_DISP_DSI] = "dsi", }; struct mtk_ddp_comp_match { @@ -442,17 +442,17 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] [DDP_COMPONENT_COLOR0] = { MTK_DISP_COLOR, 0, &ddp_color }, [DDP_COMPONENT_COLOR1] = { MTK_DISP_COLOR, 1, &ddp_color }, [DDP_COMPONENT_DITHER0] = { MTK_DISP_DITHER, 0, &ddp_dither }, - [DDP_COMPONENT_DP_INTF0] = { MTK_DP_INTF, 0, &ddp_dpi }, - [DDP_COMPONENT_DP_INTF1] = { MTK_DP_INTF, 1, &ddp_dpi }, - [DDP_COMPONENT_DPI0] = { MTK_DPI, 0, &ddp_dpi }, - [DDP_COMPONENT_DPI1] = { MTK_DPI, 1, &ddp_dpi }, + [DDP_COMPONENT_DP_INTF0] = { MTK_DISP_DP_INTF, 0, &ddp_dpi }, + [DDP_COMPONENT_DP_INTF1] = { MTK_DISP_DP_INTF, 1, &ddp_dpi }, + [DDP_COMPONENT_DPI0] = { MTK_DISP_DPI, 0, &ddp_dpi }, + [DDP_COMPONENT_DPI1] = { MTK_DISP_DPI, 1, &ddp_dpi }, [DDP_COMPONENT_DRM_OVL_ADAPTOR] = { MTK_DISP_OVL_ADAPTOR, 0, &ddp_ovl_adaptor }, [DDP_COMPONENT_DSC0] = { MTK_DISP_DSC, 0, &ddp_dsc }, [DDP_COMPONENT_DSC1] = { MTK_DISP_DSC, 1, &ddp_dsc }, - [DDP_COMPONENT_DSI0] = { MTK_DSI, 0, &ddp_dsi }, - [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, &ddp_dsi }, - [DDP_COMPONENT_DSI2] = { MTK_DSI, 2, &ddp_dsi }, - [DDP_COMPONENT_DSI3] = { MTK_DSI, 3, &ddp_dsi }, + [DDP_COMPONENT_DSI0] = { MTK_DISP_DSI, 0, &ddp_dsi }, + [DDP_COMPONENT_DSI1] = { MTK_DISP_DSI, 1, &ddp_dsi }, + [DDP_COMPONENT_DSI2] = { MTK_DISP_DSI, 2, &ddp_dsi }, + [DDP_COMPONENT_DSI3] = { MTK_DISP_DSI, 3, &ddp_dsi }, [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma }, [DDP_COMPONENT_MERGE0] = { MTK_DISP_MERGE, 0, &ddp_merge }, [DDP_COMPONENT_MERGE1] = { MTK_DISP_MERGE, 1, &ddp_merge }, @@ -659,9 +659,9 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *node, struct mtk_d type == MTK_DISP_PWM || type == MTK_DISP_RDMA || type == MTK_DISP_WDMA || - type == MTK_DPI || - type == MTK_DP_INTF || - type == MTK_DSI) + type == MTK_DISP_DPI || + type == MTK_DISP_DP_INTF || + type == MTK_DISP_DSI) return 0; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index e54f0654f2f9..9c6dfc1e384b 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -801,35 +801,35 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { { .compatible = "mediatek,mt8173-disp-wdma", .data = (void *)MTK_DISP_WDMA }, { .compatible = "mediatek,mt2701-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt8167-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8173-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt8183-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt8186-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt8188-dp-intf", - .data = (void *)MTK_DP_INTF }, + .data = (void *)MTK_DISP_DP_INTF }, { .compatible = "mediatek,mt8192-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt8195-dp-intf", - .data = (void *)MTK_DP_INTF }, + .data = (void *)MTK_DISP_DP_INTF }, { .compatible = "mediatek,mt8195-dpi", - .data = (void *)MTK_DPI }, + .data = (void *)MTK_DISP_DPI }, { .compatible = "mediatek,mt2701-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8173-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8183-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8186-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8188-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { .compatible = "mediatek,mt8196-dsi", - .data = (void *)MTK_DSI }, + .data = (void *)MTK_DISP_DSI }, { } }; @@ -1176,9 +1176,9 @@ static int mtk_drm_probe(struct platform_device *pdev) comp_type == MTK_DISP_OVL_ADAPTOR || comp_type == MTK_DISP_RDMA || comp_type == MTK_DISP_WDMA || - comp_type == MTK_DP_INTF || - comp_type == MTK_DPI || - comp_type == MTK_DSI) { + comp_type == MTK_DISP_DP_INTF || + comp_type == MTK_DISP_DPI || + comp_type == MTK_DISP_DSI) { dev_info(dev, "Adding component match for %pOF\n", node); drm_of_component_match_add(dev, &match, component_compare_of, diff --git a/include/linux/soc/mediatek/mtk-mmsys.h b/include/linux/soc/mediatek/mtk-mmsys.h index 3ddfdeac658d..bbdd0b01927d 100644 --- a/include/linux/soc/mediatek/mtk-mmsys.h +++ b/include/linux/soc/mediatek/mtk-mmsys.h @@ -111,9 +111,9 @@ enum mtk_ddp_comp_type { MTK_DISP_MDP_RDMA, /* Keep Display outputs at the end for readability */ - MTK_DPI, - MTK_DP_INTF, - MTK_DSI, + MTK_DISP_DPI, + MTK_DISP_DP_INTF, + MTK_DISP_DSI, MTK_DDP_COMP_TYPE_MAX }; -- 2.54.0
