[PATCH v5 10/14] media: platform: mtk-mdp3: add support for blending multiple components

[Moudy Ho]

Certain chips can combine several components to form complex virtual
units with advanced functions.
These components require simultaneous configuration of their MODs and
clocks.

Signed-off-by: Moudy Ho <moudy...@mediatek.com>
---
 .../platform/mediatek/mdp3/mtk-mdp3-cmdq.c    | 10 +++++++++-
 .../platform/mediatek/mdp3/mtk-mdp3-comp.c    | 20 ++++++++++++++++++-
 .../platform/mediatek/mdp3/mtk-mdp3-comp.h    |  7 +++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c 
b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index 6204173ecc5d..9c2afd002e7c 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -117,17 +117,25 @@ static int mdp_path_subfrm_require(const struct mdp_path 
*path,
        /* Set mutex mod */
        for (index = 0; index < num_comp; index++) {
                s32 inner_id = MDP_COMP_NONE;
+               const u32 *mutex_idx;
+               const struct mdp_comp_blend *b;
 
                if (CFG_CHECK(MT8183, p_id))
                        inner_id = CFG_GET(MT8183, path->config, 
components[index].type);
                if (mdp_cfg_comp_is_dummy(path->mdp_dev, inner_id))
                        continue;
+
                ctx = &path->comps[index];
                if (is_output_disabled(p_id, ctx->param, count))
                        continue;
+
+               mutex_idx = data->mdp_mutex_table_idx;
                id = ctx->comp->public_id;
-               mtk_mutex_write_mod(mutex, data->mdp_mutex_table_idx[id], 
false);
+               mtk_mutex_write_mod(mutex, mutex_idx[id], false);
 
+               b = &data->comp_data[id].blend;
+               if (b && b->aid_mod)
+                       mtk_mutex_write_mod(mutex, mutex_idx[b->b_id], false);
        }
 
        mtk_mutex_write_sof(mutex, MUTEX_SOF_IDX_SINGLE_MODE);
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c 
b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index ec296d4fd0c5..bb21fa2f5c3b 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -858,9 +858,19 @@ int mdp_comp_clocks_on(struct device *dev, struct mdp_comp 
*comps, int num)
        int i, ret;
 
        for (i = 0; i < num; i++) {
+               struct mdp_dev *mdp_dev = comps[i].mdp_dev;
+               enum mtk_mdp_comp_id id = comps[i].public_id;
+               const struct mdp_comp_blend *b = 
&mdp_dev->mdp_data->comp_data[id].blend;
+
                ret = mdp_comp_clock_on(dev, &comps[i]);
                if (ret)
                        return ret;
+
+               if (b && b->aid_clk) {
+                       ret = mdp_comp_clock_on(dev, mdp_dev->comp[id]);
+                       if (ret)
+                               return ret;
+               }
        }
 
        return 0;
@@ -870,8 +880,16 @@ void mdp_comp_clocks_off(struct device *dev, struct 
mdp_comp *comps, int num)
 {
        int i;
 
-       for (i = 0; i < num; i++)
+       for (i = 0; i < num; i++) {
+               struct mdp_dev *mdp_dev = comps[i].mdp_dev;
+               enum mtk_mdp_comp_id id = comps[i].public_id;
+               const struct mdp_comp_blend *b = 
&mdp_dev->mdp_data->comp_data[id].blend;
+
                mdp_comp_clock_off(dev, &comps[i]);
+
+               if (b && b->aid_clk)
+                       mdp_comp_clock_off(dev, mdp_dev->comp[id]);
+       }
 }
 
 static int mdp_get_subsys_id(struct mdp_dev *mdp, struct device *dev,
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h 
b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
index 09e46dfe4f02..e31e1f088b32 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.h
@@ -201,9 +201,16 @@ struct mdp_comp_info {
        u32 dts_reg_ofst;
 };
 
+struct mdp_comp_blend {
+       enum mtk_mdp_comp_id b_id;
+       bool aid_mod;
+       bool aid_clk;
+};
+
 struct mdp_comp_data {
        struct mdp_comp_match match;
        struct mdp_comp_info info;
+       struct mdp_comp_blend blend;
 };
 
 struct mdp_comp_ops;
-- 
2.18.0