Hi,
Le lundi 02 juin 2025 à 01:31 +0800, Jason-JH Lin a écrit :
> With the removal of the shift_pa parameter, cmdq_pkt_jump_rel_temp()
> can be replaced by the new cmdq_pkt_jump_rel() without shift_pa.
>
> Then, remove the cmdq_shift_pa variable in the mdp_dev structure for
> each mbox client.
>
> Fixes: ade176534112 ("soc: mediatek: cmdq: Add parameter shift_pa to
> cmdq_pkt_jump()")
> Signed-off-by: Jason-JH Lin <jason-jh....@mediatek.com>
> ---
> drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +-
> drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 --
> drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h | 1 -
> 3 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
> b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-
> cmdq.c
> index 7575ec376367..c35fe0e3a4d5 100644
> --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
> +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
> @@ -638,7 +638,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct
> mdp_dev *mdp,
> goto err_free_path;
> }
> cmdq_pkt_eoc(&cmd->pkt);
> - cmdq_pkt_jump_rel_temp(&cmd->pkt, CMDQ_INST_SIZE,
> mdp->cmdq_shift_pa[pp_idx]);
> + cmdq_pkt_jump_rel(&cmd->pkt, CMDQ_INST_SIZE);
Did I miss something or this reverts the change made in 15/20 ? I'm also
unsure if its correct to ask for backports of this with Fixes tag. Isn't this
for MT8196, a new board ?
Nicolas
>
> for (i = 0; i < num_comp; i++) {
> s32 inner_id = MDP_COMP_NONE;
> diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
> b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-
> core.c
> index 8de2c8e4d333..2f8147481bd6 100644
> --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
> +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.c
> @@ -293,8 +293,6 @@ static int mdp_probe(struct platform_device *pdev)
> ret = PTR_ERR(mdp->cmdq_clt[i]);
> goto err_mbox_destroy;
> }
> -
> - mdp->cmdq_shift_pa[i] =
> cmdq_get_shift_pa(mdp->cmdq_clt[i]->chan);
> }
>
> init_waitqueue_head(&mdp->callback_wq);
> diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
> b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-
> core.h
> index 05cade1d098e..430251f63754 100644
> --- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
> +++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-core.h
> @@ -126,7 +126,6 @@ struct mdp_dev {
> u32 id_count;
> struct ida mdp_ida;
> struct cmdq_client *cmdq_clt[MDP_PP_MAX];
> - u8 cmdq_shift_pa[MDP_PP_MAX];
> wait_queue_head_t callback_wq;
>
> struct v4l2_device v4l2_dev;
