media: platform: mtk-mdp3: chip config split about pipe info

In MDP3, a pipe is used to represent a data path which
consisting of different components and MUTEX, as shown in
the following diagram:

                     +----------------------------+
                     |           MUTEX [*1]       |
                     +----------------------------+
                        S ^ S ^  S ^  S ^  S ^
                        | | | |  | |  | |  | |
                        | | | |  | |  | |  | |
         +--------------+ | | |  | |  | |  | +-------------+
         | +--------------+ | |  | |  | |  +-------------+ |
         | |         +------+ |  | |  | +------+         | |
         | |         | +------+  | |  +------+ |         | |
         | |         | |         | |         | |         | |
         | |         | |         | |         | |         | |
         v E         v E         v E         v E         v E
      +-------+    +-----+    +-------+    +-----+    +-------+
B>--->| RDMA0 |>-->| PQ  |>-->| RSZ0  |>-->| PQ  |>-->| WROT0 |>-->B
      +-------+    +-----+    +-------+    +-----+    +-------+

[*1] MUTEX is SOF/EOF signal controller
[*2] S = Start of frame (SOF)
[*3] E = End of frame (EOF)
[*4] B = frame buffer

More pipes will be introduced in future chips for applications such as
higher frame rate frequency, which should integrate and reorder related
information into specific chip config file.

Signed-off-by: Moudy Ho <moudy.ho@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
index 1769bce..cf97ba7 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
+++ b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
@@ -400,6 +400,13 @@ static const struct mdp_limit mt8183_mdp_def_limit = {
        .v_scale_down_max = 128,
 };
 
+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}
+};
+
 const struct mtk_mdp_driver_data mt8183_mdp_driver_data = {
        .mdp_probe_infra = mt8183_mdp_probe_infra,
        .mdp_cfg = &mt8183_plat_cfg,
@@ -410,6 +417,8 @@ const struct mtk_mdp_driver_data mt8183_mdp_driver_data = {
        .format = mt8183_formats,
        .format_len = ARRAY_SIZE(mt8183_formats),
        .def_limit = &mt8183_mdp_def_limit,
+       .pipe_info = mt8183_pipe_info,
+       .pipe_info_len = ARRAY_SIZE(mt8183_pipe_info),
 };
 
 s32 mdp_cfg_get_id_inner(struct mdp_dev *mdp_dev, enum mtk_mdp_comp_id id)

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index dcd77f6..bff14e4 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -50,21 +50,22 @@ static int mdp_path_subfrm_require(const struct mdp_path *path,
        /* Decide which mutex to use based on the current pipeline */
        switch (path->comps[0].comp->public_id) {
        case MDP_COMP_RDMA0:
-               *mutex_id = MDP_PIPE_RDMA0;
+               index = MDP_PIPE_RDMA0;
                break;
        case MDP_COMP_ISP_IMGI:
-               *mutex_id = MDP_PIPE_IMGI;
+               index = MDP_PIPE_IMGI;
                break;
        case MDP_COMP_WPEI:
-               *mutex_id = MDP_PIPE_WPEI;
+               index = MDP_PIPE_WPEI;
                break;
        case MDP_COMP_WPEI2:
-               *mutex_id = MDP_PIPE_WPEI2;
+               index = MDP_PIPE_WPEI2;
                break;
        default:
                dev_err(dev, "Unknown pipeline and no mutex is assigned");
                return -EINVAL;
        }
+       *mutex_id = data->pipe_info[index].mutex_id;
 
        /* Set mutex mod */
        for (index = 0; index < config->num_components; index++) {
@@ -286,11 +287,13 @@ static void mdp_auto_release_work(struct work_struct *work)
 {
        struct mdp_cmdq_cmd *cmd;
        struct mdp_dev *mdp;
+       int id;
 
        cmd = container_of(work, struct mdp_cmdq_cmd, auto_release_work);
        mdp = cmd->mdp;
 
-       mtk_mutex_unprepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]);
+       id = mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0].mutex_id;
+       mtk_mutex_unprepare(mdp->mdp_mutex[id]);
        mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps,
                            cmd->num_comps);
 
@@ -310,6 +313,7 @@ static void mdp_handle_cmdq_callback(struct mbox_client *cl, void *mssg)
        struct cmdq_cb_data *data;
        struct mdp_dev *mdp;
        struct device *dev;
+       int id;
 
        if (!mssg) {
                pr_info("%s:no callback data\n", __func__);
@@ -335,7 +339,8 @@ static void mdp_handle_cmdq_callback(struct mbox_client *cl, void *mssg)
        INIT_WORK(&cmd->auto_release_work, mdp_auto_release_work);
        if (!queue_work(mdp->clock_wq, &cmd->auto_release_work)) {
                dev_err(dev, "%s:queue_work fail!\n", __func__);
-               mtk_mutex_unprepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]);
+               id = mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0].mutex_id;
+               mtk_mutex_unprepare(mdp->mdp_mutex[id]);
                mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps,
                                    cmd->num_comps);
 
@@ -387,7 +392,8 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param)
                goto err_free_comps;
        }
 
-       ret = mtk_mutex_prepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]);
+       i = mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0].mutex_id;
+       ret = mtk_mutex_prepare(mdp->mdp_mutex[i]);
        if (ret) {
                dev_err(dev, "Fail to enable mutex clk\n");
                goto err_free_path;
@@ -453,7 +459,8 @@ err_clock_off:
        mdp_comp_clocks_off(&mdp->pdev->dev, cmd->comps,
                            cmd->num_comps);
 err_free_path:
-       mtk_mutex_unprepare(mdp->mdp_mutex[MDP_PIPE_RDMA0]);
+       i = mdp->mdp_data->pipe_info[MDP_PIPE_RDMA0].mutex_id;
+       mtk_mutex_unprepare(mdp->mdp_mutex[i]);
        kfree(path);
 err_free_comps:
        kfree(comps);

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
index 75cf41b..aa6c225 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
@@ -153,7 +153,7 @@ static int mdp_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct mdp_dev *mdp;
        struct platform_device *mm_pdev;
-       int ret, i;
+       int ret, i, mutex_id;
 
        mdp = kzalloc(sizeof(*mdp), GFP_KERNEL);
        if (!mdp) {
@@ -176,10 +176,13 @@ static int mdp_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto err_destroy_device;
        }
-       for (i = 0; i < MDP_PIPE_MAX; i++) {
-               mdp->mdp_mutex[i] = mtk_mutex_get(&mm_pdev->dev);
-               if (IS_ERR(mdp->mdp_mutex[i])) {
-                       ret = PTR_ERR(mdp->mdp_mutex[i]);
+       for (i = 0; i < mdp->mdp_data->pipe_info_len; i++) {
+               mutex_id = mdp->mdp_data->pipe_info[i].mutex_id;
+               if (!IS_ERR_OR_NULL(mdp->mdp_mutex[mutex_id]))
+                       continue;
+               mdp->mdp_mutex[mutex_id] = mtk_mutex_get(&mm_pdev->dev);
+               if (IS_ERR(mdp->mdp_mutex[mutex_id])) {
+                       ret = PTR_ERR(mdp->mdp_mutex[mutex_id]);
                        goto err_free_mutex;
                }
        }
@@ -259,7 +262,7 @@ err_destroy_job_wq:
 err_deinit_comp:
        mdp_comp_destroy(mdp);
 err_free_mutex:
-       for (i = 0; i < MDP_PIPE_MAX; i++)
+       for (i = 0; i < mdp->mdp_data->pipe_info_len; i++)
                if (!IS_ERR_OR_NULL(mdp->mdp_mutex[i]))
                        mtk_mutex_put(mdp->mdp_mutex[i]);
 err_destroy_device:

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
index a312c10..59a1c88 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
@@ -43,10 +43,10 @@ struct mdp_platform_config {
 
 /* indicate which mutex is used by each pipepline */
 enum mdp_pipe_id {
-       MDP_PIPE_RDMA0,
-       MDP_PIPE_IMGI,
        MDP_PIPE_WPEI,
        MDP_PIPE_WPEI2,
+       MDP_PIPE_IMGI,
+       MDP_PIPE_RDMA0,
        MDP_PIPE_MAX
 };
 
@@ -60,6 +60,8 @@ struct mtk_mdp_driver_data {
        const struct mdp_format *format;
        unsigned int format_len;
        const struct mdp_limit *def_limit;
+       const struct mdp_pipe_info *pipe_info;
+       unsigned int pipe_info_len;
 };
 
 struct mdp_dev {
@@ -91,6 +93,11 @@ struct mdp_dev {
        atomic_t                                job_count;
 };
 
+struct mdp_pipe_info {
+       enum mdp_pipe_id pipe_id;
+       u32 mutex_id;
+};
+
 int mdp_vpu_get_locked(struct mdp_dev *mdp);
 void mdp_vpu_put_locked(struct mdp_dev *mdp);
 int mdp_vpu_register(struct mdp_dev *mdp);