| Message ID | 20250601173355.1731140-1-jason-jh.lin@mediatek.com |
|---|---|
| Headers | show |
| Series | Add GCE support for MT8196 | expand |
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.lin@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;
This patch series adds support for the MediaTek MT8196 SoC in the CMDQ driver and related subsystems. The changes include adding compatible names and iommus property, updating driver data to accommodate hardware changes, and modifying the usage of CMDQ APIs to support non-subsys ID hardware. --- Change in v6: 1. Move the removal patches to the end of series. 2. Fix build error for cmdq_pkt_jump_rel_temp patch. Change in RESEND v5: 1. Separate the removal of cmdq_get_shift_pa() from [PATCH v5 03/19] to a single patch [PATCH RESEND v5 10/20]. Change in v5: 1. Rebase on tag: next-20250424 + patch [1]. 2. Split adding driver data for MT8196 patch to 3 independent patch and add more detail commit message to each patch. 3. Refine passing shift_pa as the parameter in API to storing it into the cmdq_pkt. 4. Refine DMA address potential issue in cmdq mailbox driver. 5. Change the mminfra_offset related mbox API to passing it by cmdq_pkt. 6. Add new cmdq_pkt_write_pa() and cmdq_pkt_write_subsys() APIs to replace the cmdq_pkt_write(). [1] mailbox: mtk-cmdq: Refine GCE_GCTL_VALUE setting - https://patchwork.kernel.org/project/linux-mediatek/patch/20250421035650.441383-1-jason-jh.lin@mediatek.com/ Change in v4: 1. Remove dt-binding header and add a gce header in dts folder. 2. Remove dot in sign-off name. 3. Change addr type from u32 to dma_addr_t for cmdq_reg_shift_addr() and cmdq_reg_revert_addr(). Change in v3: 1. Merge 2 dt-bindings pathes together and add more detail commit message. 2. Change type u32 to phys_addr_t for pa_base of struct cmdq_client_reg. 3. Remove cmdq_subsys_is_valid() and subsys_num in CMDQ driver. 4. Add CMDQ_SUBSYS_INVALID to check subsys instead of using cmdq_subsys_is_invalid(). 5. Make use of CMDQ_THR_SPR0 define to the parameter of CMDQ APIs. 6. Rebase on the new MACRO in mtk-mdp3-comp.h. Change in v2: 1. Remove the constant and fix warning in dt-bindings. 2. Remove the pa_base parameter of CMDQ APIs and related modification. 3. Move subsys checking to client drivers and use 2 alternative CMDQ APIs to achieve the same functionality. --- Jason-JH Lin (20): arm64: dts: mediatek: Add GCE header for MT8196 mailbox: mtk-cmdq: Refine DMA address handling for the command buffer mailbox: mtk-cmdq: Add cmdq private data to cmdq_pkt for generating instruction soc: mediatek: mtk-cmdq: Add cmdq_get_mbox_priv() in cmdq_pkt_create() soc: mediatek: mtk-cmdq: Add cmdq_pkt_jump_rel_temp() for removing shift_pa mailbox: mtk-cmdq: Add GCE hardware virtualization configuration mailbox: mtk-cmdq: Add mminfra_offset configuration for DRAM transaction mailbox: mtk-cmdq: Add driver data to support for MT8196 soc: mediatek: mtk-cmdq: Add pa_base parsing for hardware without subsys ID support soc: mediatek: mtk-cmdq: Add new APIs to replace cmdq_pkt_write() and cmdq_pkt_write_mask() soc: mediatek: mtk-cmdq: Add mminfra_offset adjustment for DRAM addresses soc: mediatek: Add programming flow for unsupported subsys ID hardware drm/mediatek: Add programming flow for unsupported subsys ID hardware media: platform: mtk-mdp3: Add programming flow for unsupported subsys ID hardware media: platform: mtk-mdp3: Change cmdq_pkt_jump_rel() to cmdq_pkt_jump_rel_temp() soc: mediatek: mtk-cmdq: Remove shift_pa parameter from cmdq_pkt_jump() media: platform: mtk-mdp3: Use cmdq_pkt_jump_rel() without shift_pa soc: mediatek: mtk-cmdq: Remove cmdq_pkt_jump() and cmdq_pkt_jump_rel_temp() soc: mediatek: mtk-cmdq: Remove cmdq_pkt_write() and cmdq_pkt_write_mask() mailbox: mtk-cmdq: Remove unsued cmdq_get_shift_pa() arch/arm64/boot/dts/mediatek/mt8196-gce.h | 612 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 24 +- drivers/mailbox/mtk-cmdq-mailbox.c | 115 +++- .../platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 16 +- .../platform/mediatek/mdp3/mtk-mdp3-comp.h | 70 +- .../platform/mediatek/mdp3/mtk-mdp3-core.c | 2 - .../platform/mediatek/mdp3/mtk-mdp3-core.h | 1 - drivers/soc/mediatek/mtk-cmdq-helper.c | 68 +- drivers/soc/mediatek/mtk-mmsys.c | 12 +- drivers/soc/mediatek/mtk-mutex.c | 8 +- include/linux/mailbox/mtk-cmdq-mailbox.h | 19 +- include/linux/soc/mediatek/mtk-cmdq.h | 83 ++- 12 files changed, 941 insertions(+), 89 deletions(-) create mode 100644 arch/arm64/boot/dts/mediatek/mt8196-gce.h