media: platform: mtk-mdp3: add support second sets of MMSYS

The MT8195 chipset features two MMSYS subsets: VPPSYS0 and VPPSYS1.
These subsets coordinate and control the clock, power, and
register settings required for the components of MDP3.

Signed-off-by: Moudy Ho <moudy.ho@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
index 502eeae0bfdc44590036511532c67a381d3144e6..fcc582292b77242c4e42bb352c324b6cdf4a9497 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
+++ b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
@@ -73,75 +73,75 @@ static const u32 mt8183_mutex_idx[MDP_MAX_COMP_COUNT] = {
 
 static const struct mdp_comp_data mt8183_mdp_comp_data[MDP_MAX_COMP_COUNT] = {
        [MDP_COMP_WPEI] = {
-               {MDP_COMP_TYPE_WPEI, 0, MT8183_MDP_COMP_WPEI},
+               {MDP_COMP_TYPE_WPEI, 0, MT8183_MDP_COMP_WPEI, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_WPEO] = {
-               {MDP_COMP_TYPE_EXTO, 2, MT8183_MDP_COMP_WPEO},
+               {MDP_COMP_TYPE_EXTO, 2, MT8183_MDP_COMP_WPEO, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_WPEI2] = {
-               {MDP_COMP_TYPE_WPEI, 1, MT8183_MDP_COMP_WPEI2},
+               {MDP_COMP_TYPE_WPEI, 1, MT8183_MDP_COMP_WPEI2, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_WPEO2] = {
-               {MDP_COMP_TYPE_EXTO, 3, MT8183_MDP_COMP_WPEO2},
+               {MDP_COMP_TYPE_EXTO, 3, MT8183_MDP_COMP_WPEO2, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_ISP_IMGI] = {
-               {MDP_COMP_TYPE_IMGI, 0, MT8183_MDP_COMP_ISP_IMGI},
+               {MDP_COMP_TYPE_IMGI, 0, MT8183_MDP_COMP_ISP_IMGI, MDP_MM_SUBSYS_0},
                {0, 0, 4}
        },
        [MDP_COMP_ISP_IMGO] = {
-               {MDP_COMP_TYPE_EXTO, 0, MT8183_MDP_COMP_ISP_IMGO},
+               {MDP_COMP_TYPE_EXTO, 0, MT8183_MDP_COMP_ISP_IMGO, MDP_MM_SUBSYS_0},
                {0, 0, 4}
        },
        [MDP_COMP_ISP_IMG2O] = {
-               {MDP_COMP_TYPE_EXTO, 1, MT8183_MDP_COMP_ISP_IMG2O},
+               {MDP_COMP_TYPE_EXTO, 1, MT8183_MDP_COMP_ISP_IMG2O, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_CAMIN] = {
-               {MDP_COMP_TYPE_DL_PATH, 0, MT8183_MDP_COMP_CAMIN},
+               {MDP_COMP_TYPE_DL_PATH, 0, MT8183_MDP_COMP_CAMIN, MDP_MM_SUBSYS_0},
                {2, 2, 1}
        },
        [MDP_COMP_CAMIN2] = {
-               {MDP_COMP_TYPE_DL_PATH, 1, MT8183_MDP_COMP_CAMIN2},
+               {MDP_COMP_TYPE_DL_PATH, 1, MT8183_MDP_COMP_CAMIN2, MDP_MM_SUBSYS_0},
                {2, 4, 1}
        },
        [MDP_COMP_RDMA0] = {
-               {MDP_COMP_TYPE_RDMA, 0, MT8183_MDP_COMP_RDMA0},
+               {MDP_COMP_TYPE_RDMA, 0, MT8183_MDP_COMP_RDMA0, MDP_MM_SUBSYS_0},
                {2, 0, 0}
        },
        [MDP_COMP_CCORR0] = {
-               {MDP_COMP_TYPE_CCORR, 0, MT8183_MDP_COMP_CCORR0},
+               {MDP_COMP_TYPE_CCORR, 0, MT8183_MDP_COMP_CCORR0, MDP_MM_SUBSYS_0},
                {1, 0, 0}
        },
        [MDP_COMP_RSZ0] = {
-               {MDP_COMP_TYPE_RSZ, 0, MT8183_MDP_COMP_RSZ0},
+               {MDP_COMP_TYPE_RSZ, 0, MT8183_MDP_COMP_RSZ0, MDP_MM_SUBSYS_0},
                {1, 0, 0}
        },
        [MDP_COMP_RSZ1] = {
-               {MDP_COMP_TYPE_RSZ, 1, MT8183_MDP_COMP_RSZ1},
+               {MDP_COMP_TYPE_RSZ, 1, MT8183_MDP_COMP_RSZ1, MDP_MM_SUBSYS_0},
                {1, 0, 0}
        },
        [MDP_COMP_TDSHP0] = {
-               {MDP_COMP_TYPE_TDSHP, 0, MT8183_MDP_COMP_TDSHP0},
+               {MDP_COMP_TYPE_TDSHP, 0, MT8183_MDP_COMP_TDSHP0, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_PATH0_SOUT] = {
-               {MDP_COMP_TYPE_PATH, 0, MT8183_MDP_COMP_PATH0_SOUT},
+               {MDP_COMP_TYPE_PATH, 0, MT8183_MDP_COMP_PATH0_SOUT, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_PATH1_SOUT] = {
-               {MDP_COMP_TYPE_PATH, 1, MT8183_MDP_COMP_PATH1_SOUT},
+               {MDP_COMP_TYPE_PATH, 1, MT8183_MDP_COMP_PATH1_SOUT, MDP_MM_SUBSYS_0},
                {0, 0, 0}
        },
        [MDP_COMP_WROT0] = {
-               {MDP_COMP_TYPE_WROT, 0, MT8183_MDP_COMP_WROT0},
+               {MDP_COMP_TYPE_WROT, 0, MT8183_MDP_COMP_WROT0, MDP_MM_SUBSYS_0},
                {1, 0, 0}
        },
        [MDP_COMP_WDMA] = {
-               {MDP_COMP_TYPE_WDMA, 0, MT8183_MDP_COMP_WDMA},
+               {MDP_COMP_TYPE_WDMA, 0, MT8183_MDP_COMP_WDMA, MDP_MM_SUBSYS_0},
                {1, 0, 0}
        },
 };
@@ -402,10 +402,10 @@ static const struct mdp_limit mt8183_mdp_def_limit = {
 };
 
 static const struct mdp_pipe_info mt8183_pipe_info[] = {
-       [MDP_PIPE_WPEI] = {MDP_PIPE_WPEI, 0},
-       [MDP_PIPE_WPEI2] = {MDP_PIPE_WPEI2, 1},
-       [MDP_PIPE_IMGI] = {MDP_PIPE_IMGI, 2},
-       [MDP_PIPE_RDMA0] = {MDP_PIPE_RDMA0, 3}
+       [MDP_PIPE_WPEI] = {MDP_PIPE_WPEI, MDP_MM_SUBSYS_0, 0},
+       [MDP_PIPE_WPEI2] = {MDP_PIPE_WPEI2, MDP_MM_SUBSYS_0, 1},
+       [MDP_PIPE_IMGI] = {MDP_PIPE_IMGI, MDP_MM_SUBSYS_0, 2},
+       [MDP_PIPE_RDMA0] = {MDP_PIPE_RDMA0, MDP_MM_SUBSYS_0, 3}
 };
 
 const struct mtk_mdp_driver_data mt8183_mdp_driver_data = {

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
index 20d2bcb77ef93c12762e45dc5fd1949dc2f36e72..e89c51e1edb7a73f030f8b71a1606d518707919a 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
@@ -138,6 +138,7 @@ struct mdp_comp_match {
        enum mdp_comp_type type;
        u32 alias_id;
        s32 inner_id;
+       s32 subsys_id;
 };
 
 /* Used to describe the item order in MDP property */

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
index 94f4ed78523bb8becb4d7775aa4e7e1e79c649e6..8cd0f11fc29063ed69b3b75f188096795fae2d77 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
@@ -26,9 +26,10 @@ static const struct of_device_id mdp_of_ids[] = {
 MODULE_DEVICE_TABLE(of, mdp_of_ids);
 
 static struct platform_device *__get_pdev_by_id(struct platform_device *pdev,
+                                               struct platform_device *from,
                                                enum mdp_infra_id id)
 {
-       struct device_node *node;
+       struct device_node *node, *f = NULL;
        struct platform_device *mdp_pdev = NULL;
        const struct mtk_mdp_driver_data *mdp_data;
        const char *compat;
@@ -46,9 +47,14 @@ static struct platform_device *__get_pdev_by_id(struct platform_device *pdev,
                dev_err(&pdev->dev, "have no driver data to find node\n");
                return NULL;
        }
+
        compat = mdp_data->mdp_probe_infra[id].compatible;
+       if (strlen(compat) == 0)
+               return NULL;
 
-       node = of_find_compatible_node(NULL, NULL, compat);
+       if (from)
+               f = from->dev.of_node;
+       node = of_find_compatible_node(f, NULL, compat);
        if (WARN_ON(!node)) {
                dev_err(&pdev->dev, "find node from id %d failed\n", id);
                return NULL;
@@ -148,6 +154,46 @@ void mdp_video_device_release(struct video_device *vdev)
        kfree(mdp);
 }
 
+static int mdp_mm_subsys_deploy(struct mdp_dev *mdp, enum mdp_infra_id id)
+{
+       struct platform_device *mm_pdev = NULL;
+       struct device **dev;
+       int i;
+
+       if (!mdp)
+               return -EINVAL;
+
+       for (i = 0; i < MDP_MM_SUBSYS_MAX; i++) {
+               const char *compat;
+               enum mdp_infra_id sub_id = id + i;
+
+               switch (id) {
+               case MDP_INFRA_MMSYS:
+                       dev = &mdp->mm_subsys[i].mmsys;
+                       break;
+               default:
+                       dev_err(&mdp->pdev->dev, "Unknown infra id %d", id);
+                       return -EINVAL;
+               }
+
+               /*
+                * Not every chip has multiple multimedia subsystems, so
+                * the config may be null.
+                */
+               compat = mdp->mdp_data->mdp_probe_infra[sub_id].compatible;
+               if (strlen(compat) == 0)
+                       continue;
+
+               mm_pdev = __get_pdev_by_id(mdp->pdev, mm_pdev, sub_id);
+               if (WARN_ON(!mm_pdev))
+                       return -ENODEV;
+
+               *dev = &mm_pdev->dev;
+       }
+
+       return 0;
+}
+
 static int mdp_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -164,14 +210,11 @@ static int mdp_probe(struct platform_device *pdev)
        mdp->pdev = pdev;
        mdp->mdp_data = of_device_get_match_data(&pdev->dev);
 
-       mm_pdev = __get_pdev_by_id(pdev, MDP_INFRA_MMSYS);
-       if (!mm_pdev) {
-               ret = -ENODEV;
+       ret = mdp_mm_subsys_deploy(mdp, MDP_INFRA_MMSYS);
+       if (ret)
                goto err_destroy_device;
-       }
-       mdp->mdp_mmsys = &mm_pdev->dev;
 
-       mm_pdev = __get_pdev_by_id(pdev, MDP_INFRA_MUTEX);
+       mm_pdev = __get_pdev_by_id(pdev, NULL, MDP_INFRA_MUTEX);
        if (WARN_ON(!mm_pdev)) {
                ret = -ENODEV;
                goto err_destroy_device;
@@ -210,7 +253,7 @@ static int mdp_probe(struct platform_device *pdev)
 
        mdp->scp = scp_get(pdev);
        if (!mdp->scp) {
-               mm_pdev = __get_pdev_by_id(pdev, MDP_INFRA_SCP);
+               mm_pdev = __get_pdev_by_id(pdev, NULL, MDP_INFRA_SCP);
                if (WARN_ON(!mm_pdev)) {
                        dev_err(&pdev->dev, "Could not get scp device\n");
                        ret = -ENODEV;

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
index 7e21d226ceb81ee02db09a59205989d0971467ef..7a7cdd0ce968096753484d4ba4bc3cf6c22ec07c 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
@@ -19,12 +19,23 @@
 #define MDP_PHANDLE_NAME       "mediatek,mdp3"
 
 enum mdp_infra_id {
+       /*
+        * Due to the sequential nature of function "mdp_mm_subsys_deploy",
+        * adding new enum. necessitates careful consideration.
+        */
        MDP_INFRA_MMSYS,
+       MDP_INFRA_MMSYS2,
        MDP_INFRA_MUTEX,
        MDP_INFRA_SCP,
        MDP_INFRA_MAX
 };
 
+enum mdp_mm_subsys_id {
+       MDP_MM_SUBSYS_0,
+       MDP_MM_SUBSYS_1,
+       MDP_MM_SUBSYS_MAX,
+};
+
 enum mdp_buffer_usage {
        MDP_BUFFER_USAGE_HW_READ,
        MDP_BUFFER_USAGE_MDP,
@@ -65,9 +76,13 @@ struct mtk_mdp_driver_data {
        unsigned int pipe_info_len;
 };
 
+struct mdp_mm_subsys {
+       struct device *mmsys;
+};
+
 struct mdp_dev {
        struct platform_device                  *pdev;
-       struct device                           *mdp_mmsys;
+       struct mdp_mm_subsys                    mm_subsys[MDP_MM_SUBSYS_MAX];
        struct mtk_mutex                        *mdp_mutex[MDP_PIPE_MAX];
        struct mdp_comp                         *comp[MDP_MAX_COMP_COUNT];
        const struct mtk_mdp_driver_data        *mdp_data;
@@ -96,6 +111,7 @@ struct mdp_dev {
 
 struct mdp_pipe_info {
        enum mdp_pipe_id pipe_id;
+       enum mdp_mm_subsys_id sub_id;
        u32 mutex_id;
 };