media: platform: mtk-mdp3: add checks for dummy components

Some components act as bridges only and do not require full configuration.

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 fcc582292b77242c4e42bb352c324b6cdf4a9497..fe92c0474bfa740e6321e7f2139a5194df44bcec 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
+++ b/drivers/media/platform/mediatek/mdp3/mdp_cfg_data.c
@@ -451,3 +451,11 @@ enum mtk_mdp_comp_id mdp_cfg_get_id_public(struct mdp_dev *mdp_dev, s32 inner_id
 err_public_id:
        return public_id;
 }
+
+bool mdp_cfg_comp_is_dummy(struct mdp_dev *mdp_dev, s32 inner_id)
+{
+       enum mtk_mdp_comp_id id = mdp_cfg_get_id_public(mdp_dev, inner_id);
+       enum mdp_comp_type type = mdp_dev->mdp_data->comp_data[id].match.type;
+
+       return (type == MDP_COMP_TYPE_DUMMY);
+}

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h
index dee57cc4a954fcc5fd2c0154c34d17583174e8ec..dfffc72868e4a7288a9534889ec802e7ec66cd28 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cfg.h
@@ -16,5 +16,6 @@ enum mtk_mdp_comp_id;
 
 s32 mdp_cfg_get_id_inner(struct mdp_dev *mdp_dev, enum mtk_mdp_comp_id id);
 enum mtk_mdp_comp_id mdp_cfg_get_id_public(struct mdp_dev *mdp_dev, s32 id);
+bool mdp_cfg_comp_is_dummy(struct mdp_dev *mdp_dev, s32 inner_id);
 
 #endif  /* __MTK_MDP3_CFG_H__ */

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index 31930ddbc828b062d1c8bb671a55d880cd1dd2c4..a81caf5f472c40ff979e919d3e00becd7ea7a359 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -6,6 +6,7 @@
 
 #include <linux/mailbox_controller.h>
 #include <linux/platform_device.h>
+#include "mtk-mdp3-cfg.h"
 #include "mtk-mdp3-cmdq.h"
 #include "mtk-mdp3-comp.h"
 #include "mtk-mdp3-core.h"
@@ -108,6 +109,12 @@ 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;
+
+               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;
@@ -132,6 +139,7 @@ static int mdp_path_subfrm_run(const struct mdp_path *path,
        int index;
        u32 num_comp = 0;
        s32 event;
+       s32 inner_id = MDP_COMP_NONE;
 
        if (-1 == p->mutex_id) {
                dev_err(dev, "Incorrect mutex id");
@@ -144,6 +152,10 @@ static int mdp_path_subfrm_run(const struct mdp_path *path,
        /* Wait WROT SRAM shared to DISP RDMA */
        /* Clear SOF event for each engine */
        for (index = 0; index < num_comp; index++) {
+               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;
@@ -158,6 +170,10 @@ static int mdp_path_subfrm_run(const struct mdp_path *path,
 
        /* Wait SOF events and clear mutex modules (optional) */
        for (index = 0; index < num_comp; index++) {
+               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;
@@ -183,6 +199,12 @@ static int mdp_path_ctx_init(struct mdp_dev *mdp, struct mdp_path *path)
                return -EINVAL;
 
        for (index = 0; index < num_comp; index++) {
+               s32 inner_id = MDP_COMP_NONE;
+
+               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;
                if (CFG_CHECK(MT8183, p_id))
                        param = (void *)CFG_ADDR(MT8183, path->config, components[index]);
                ret = mdp_comp_ctx_config(mdp, &path->comps[index],
@@ -204,6 +226,7 @@ static int mdp_path_config_subfrm(struct mdp_cmdq_cmd *cmd,
        struct mdp_pipe_info pipe;
        int index, ret;
        u32 num_comp = 0;
+       s32 inner_id = MDP_COMP_NONE;
 
        if (CFG_CHECK(MT8183, p_id))
                num_comp = CFG_GET(MT8183, path->config, num_components);
@@ -223,6 +246,10 @@ static int mdp_path_config_subfrm(struct mdp_cmdq_cmd *cmd,
        }
        /* Config sub-frame information */
        for (index = (num_comp - 1); index >= 0; index--) {
+               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;
@@ -236,6 +263,10 @@ static int mdp_path_config_subfrm(struct mdp_cmdq_cmd *cmd,
                return ret;
        /* Wait components done */
        for (index = 0; index < num_comp; index++) {
+               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;
@@ -245,6 +276,10 @@ static int mdp_path_config_subfrm(struct mdp_cmdq_cmd *cmd,
        }
        /* Advance to the next sub-frame */
        for (index = 0; index < num_comp; index++) {
+               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];
                ret = call_op(ctx, advance_subfrm, cmd, count);
                if (ret)
@@ -268,6 +303,7 @@ static int mdp_path_config(struct mdp_dev *mdp, struct mdp_cmdq_cmd *cmd,
        int index, count, ret;
        u32 num_comp = 0;
        u32 num_sub = 0;
+       s32 inner_id = MDP_COMP_NONE;
 
        if (CFG_CHECK(MT8183, p_id))
                num_comp = CFG_GET(MT8183, path->config, num_components);
@@ -278,6 +314,10 @@ static int mdp_path_config(struct mdp_dev *mdp, struct mdp_cmdq_cmd *cmd,
        /* Config path frame */
        /* Reset components */
        for (index = 0; index < num_comp; index++) {
+               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];
                ret = call_op(ctx, init_comp, cmd);
                if (ret)
@@ -289,6 +329,11 @@ static int mdp_path_config(struct mdp_dev *mdp, struct mdp_cmdq_cmd *cmd,
                u32 out = 0;
 
                ctx = &path->comps[index];
+               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;
+
                if (CFG_CHECK(MT8183, p_id))
                        out = CFG_COMP(MT8183, ctx->param, outputs[0]);
 
@@ -306,6 +351,10 @@ static int mdp_path_config(struct mdp_dev *mdp, struct mdp_cmdq_cmd *cmd,
        }
        /* Post processing information */
        for (index = 0; index < num_comp; index++) {
+               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];
                ret = call_op(ctx, post_process, cmd);
                if (ret)
@@ -508,9 +557,16 @@ int mdp_cmdq_send(struct mdp_dev *mdp, struct mdp_cmdq_param *param)
        }
        cmdq_pkt_finalize(&cmd->pkt);
 
-       for (i = 0; i < num_comp; i++)
+       for (i = 0; i < num_comp; i++) {
+               s32 inner_id = MDP_COMP_NONE;
+
+               if (CFG_CHECK(MT8183, p_id))
+                       inner_id = CFG_GET(MT8183, path->config, components[i].type);
+               if (mdp_cfg_comp_is_dummy(mdp, inner_id))
+                       continue;
                memcpy(&comps[i], path->comps[i].comp,
                       sizeof(struct mdp_comp));
+       }
 
        mdp->cmdq_clt->client.rx_callback = mdp_handle_cmdq_callback;
        cmd->mdp = mdp;

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index 575c8d52acd1913d489c7e3b6ae649448eb9bc59..93df2e0134387fcdbe73e89d3a540bd0705dfbeb 100644 (file)
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -853,6 +853,9 @@ int mdp_comp_clocks_on(struct device *dev, struct mdp_comp *comps, int num)
        int i, ret;
 
        for (i = 0; i < num; i++) {
+               /* Bypass the dummy component*/
+               if (!comps[i].mdp_dev)
+                       continue;
                ret = mdp_comp_clock_on(dev, &comps[i]);
                if (ret)
                        return ret;
@@ -865,8 +868,12 @@ 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++) {
+               /* Bypass the dummy component*/
+               if (!comps[i].mdp_dev)
+                       continue;
                mdp_comp_clock_off(dev, &comps[i]);
+       }
 }
 
 static int mdp_get_subsys_id(struct mdp_dev *mdp, struct device *dev,