drm/mediatek: Add component ID to component match structure

Add component ID to component match structure so we can
configure them with a for-loop.

The main reason we do such code refactoring is that
there is a new hardware component called "Padding" since
MT8188, while MT8195 doesn't have this module, we can't
use the original logic to manage the components.

While MT8195 does not define Padding in the device tree,
the corresponding components will be NULL and being skipped
by the functions.

Reviewed-by: CK Hu <ck.hu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hsiao Chien Sung <shawn.sung@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20231214055847.4936-13-shawn.sung@mediatek.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
index 114eded8177e9c419d359270a4ab7f2bec7c1ce0..9f569d0f52b33254c17ace7ab074537b6c735c56 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -52,6 +52,7 @@ enum mtk_ovl_adaptor_comp_id {
 
 struct ovl_adaptor_comp_match {
        enum mtk_ovl_adaptor_comp_type type;
+       enum mtk_ddp_comp_id comp_id;
        int alias_id;
 };
 
@@ -68,19 +69,19 @@ static const char * const private_comp_stem[OVL_ADAPTOR_TYPE_NUM] = {
 };
 
 static const struct ovl_adaptor_comp_match comp_matches[OVL_ADAPTOR_ID_MAX] = {
-       [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 0 },
-       [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 1 },
-       [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 2 },
-       [OVL_ADAPTOR_MDP_RDMA3] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 3 },
-       [OVL_ADAPTOR_MDP_RDMA4] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 4 },
-       [OVL_ADAPTOR_MDP_RDMA5] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 5 },
-       [OVL_ADAPTOR_MDP_RDMA6] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 6 },
-       [OVL_ADAPTOR_MDP_RDMA7] = { OVL_ADAPTOR_TYPE_MDP_RDMA, 7 },
-       [OVL_ADAPTOR_MERGE0]    = { OVL_ADAPTOR_TYPE_MERGE, 1 },
-       [OVL_ADAPTOR_MERGE1]    = { OVL_ADAPTOR_TYPE_MERGE, 2 },
-       [OVL_ADAPTOR_MERGE2]    = { OVL_ADAPTOR_TYPE_MERGE, 3 },
-       [OVL_ADAPTOR_MERGE3]    = { OVL_ADAPTOR_TYPE_MERGE, 4 },
-       [OVL_ADAPTOR_ETHDR0]    = { OVL_ADAPTOR_TYPE_ETHDR, 0 },
+       [OVL_ADAPTOR_MDP_RDMA0] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA0, 0 },
+       [OVL_ADAPTOR_MDP_RDMA1] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA1, 1 },
+       [OVL_ADAPTOR_MDP_RDMA2] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA2, 2 },
+       [OVL_ADAPTOR_MDP_RDMA3] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA3, 3 },
+       [OVL_ADAPTOR_MDP_RDMA4] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA4, 4 },
+       [OVL_ADAPTOR_MDP_RDMA5] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA5, 5 },
+       [OVL_ADAPTOR_MDP_RDMA6] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA6, 6 },
+       [OVL_ADAPTOR_MDP_RDMA7] = { OVL_ADAPTOR_TYPE_MDP_RDMA, DDP_COMPONENT_MDP_RDMA7, 7 },
+       [OVL_ADAPTOR_MERGE0] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE1, 1 },
+       [OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE2, 2 },
+       [OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE3, 3 },
+       [OVL_ADAPTOR_MERGE3] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE4, 4 },
+       [OVL_ADAPTOR_ETHDR0] = { OVL_ADAPTOR_TYPE_ETHDR, DDP_COMPONENT_ETHDR_MIXER, 0 },
 };
 
 void mtk_ovl_adaptor_layer_config(struct device *dev, unsigned int idx,
@@ -314,36 +315,26 @@ size_t mtk_ovl_adaptor_get_num_formats(struct device *dev)
 
 void mtk_ovl_adaptor_add_comp(struct device *dev, struct mtk_mutex *mutex)
 {
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA0);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA1);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA2);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA3);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA4);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA5);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA6);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MDP_RDMA7);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE1);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE2);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE3);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_MERGE4);
-       mtk_mutex_add_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
+       int i;
+       struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
+
+       for (i = 0; i < OVL_ADAPTOR_ID_MAX; i++) {
+               if (!ovl_adaptor->ovl_adaptor_comp[i])
+                       continue;
+               mtk_mutex_add_comp(mutex, comp_matches[i].comp_id);
+       }
 }
 
 void mtk_ovl_adaptor_remove_comp(struct device *dev, struct mtk_mutex *mutex)
 {
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA0);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA1);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA2);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA3);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA4);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA5);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA6);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MDP_RDMA7);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE1);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE2);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE3);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_MERGE4);
-       mtk_mutex_remove_comp(mutex, DDP_COMPONENT_ETHDR_MIXER);
+       int i;
+       struct mtk_disp_ovl_adaptor *ovl_adaptor = dev_get_drvdata(dev);
+
+       for (i = 0; i < OVL_ADAPTOR_ID_MAX; i++) {
+               if (!ovl_adaptor->ovl_adaptor_comp[i])
+                       continue;
+               mtk_mutex_remove_comp(mutex, comp_matches[i].comp_id);
+       }
 }
 
 void mtk_ovl_adaptor_connect(struct device *dev, struct device *mmsys_dev, unsigned int next)