[media.git/next] media: platform: mtk-mdp3: Use cmdq_pkt_create() and cmdq_pkt_destroy()

[media-ci]

On Sun Sep 1 14:32:58 2024 +0000, Chun-Kuang Hu wrote:
> Use the cmdq_pkt_create() and cmdq_pkt_destroy() common functions
> instead of implementing specific mdp3 versions.
> 
> Signed-off-by: Chun-Kuang Hu <chunkuang...@kernel.org>
> Reviewed-by: Matthias Brugger <matthias....@gmail.com>
> Reviewed-by: AngeloGioacchino Del Regno 
> <angelogioacchino.delre...@collabora.com>
> Signed-off-by: Sebastian Fricke <sebastian.fri...@collabora.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>

Patch committed.

Thanks,
Mauro Carvalho Chehab

 .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c   | 46 +++-------------------
 .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h   |  1 +
 2 files changed, 6 insertions(+), 41 deletions(-)

---

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c 
b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
index dbbb7e205770..e5ccf673e152 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c
@@ -465,43 +465,6 @@ static int mdp_path_config(struct mdp_dev *mdp, struct 
mdp_cmdq_cmd *cmd,
        return 0;
 }
 
-static int mdp_cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt 
*pkt,
-                              size_t size)
-{
-       struct device *dev;
-       dma_addr_t dma_addr;
-
-       pkt->va_base = kzalloc(size, GFP_KERNEL);
-       if (!pkt->va_base)
-               return -ENOMEM;
-
-       pkt->buf_size = size;
-       pkt->cl = (void *)client;
-
-       dev = client->chan->mbox->dev;
-       dma_addr = dma_map_single(dev, pkt->va_base, pkt->buf_size,
-                                 DMA_TO_DEVICE);
-       if (dma_mapping_error(dev, dma_addr)) {
-               dev_err(dev, "dma map failed, size=%u\n", (u32)(u64)size);
-               kfree(pkt->va_base);
-               return -ENOMEM;
-       }
-
-       pkt->pa_base = dma_addr;
-
-       return 0;
-}
-
-static void mdp_cmdq_pkt_destroy(struct cmdq_pkt *pkt)
-{
-       struct cmdq_client *client = (struct cmdq_client *)pkt->cl;
-
-       dma_unmap_single(client->chan->mbox->dev, pkt->pa_base, pkt->buf_size,
-                        DMA_TO_DEVICE);
-       kfree(pkt->va_base);
-       pkt->va_base = NULL;
-}
-
 static void mdp_auto_release_work(struct work_struct *work)
 {
        struct mdp_cmdq_cmd *cmd;
@@ -532,7 +495,7 @@ static void mdp_auto_release_work(struct work_struct *work)
                wake_up(&mdp->callback_wq);
        }
 
-       mdp_cmdq_pkt_destroy(&cmd->pkt);
+       cmdq_pkt_destroy(mdp->cmdq_clt[cmd->pp_idx], &cmd->pkt);
        kfree(cmd->comps);
        cmd->comps = NULL;
        kfree(cmd);
@@ -572,7 +535,7 @@ static void mdp_handle_cmdq_callback(struct mbox_client 
*cl, void *mssg)
                if (refcount_dec_and_test(&mdp->job_count))
                        wake_up(&mdp->callback_wq);
 
-               mdp_cmdq_pkt_destroy(&cmd->pkt);
+               cmdq_pkt_destroy(mdp->cmdq_clt[cmd->pp_idx], &cmd->pkt);
                kfree(cmd->comps);
                cmd->comps = NULL;
                kfree(cmd);
@@ -607,7 +570,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev 
*mdp,
                goto err_uninit;
        }
 
-       ret = mdp_cmdq_pkt_create(mdp->cmdq_clt[pp_idx], &cmd->pkt, SZ_16K);
+       ret = cmdq_pkt_create(mdp->cmdq_clt[pp_idx], &cmd->pkt, SZ_16K);
        if (ret)
                goto err_free_cmd;
 
@@ -688,6 +651,7 @@ static struct mdp_cmdq_cmd *mdp_cmdq_prepare(struct mdp_dev 
*mdp,
        cmd->comps = comps;
        cmd->num_comps = num_comp;
        cmd->mdp_ctx = param->mdp_ctx;
+       cmd->pp_idx = pp_idx;
 
        kfree(path);
        return cmd;
@@ -699,7 +663,7 @@ err_free_path:
 err_free_comps:
        kfree(comps);
 err_destroy_pkt:
-       mdp_cmdq_pkt_destroy(&cmd->pkt);
+       cmdq_pkt_destroy(mdp->cmdq_clt[pp_idx], &cmd->pkt);
 err_free_cmd:
        kfree(cmd);
 err_uninit:
diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h 
b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h
index 53a30ad7e0b0..935ae9825728 100644
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h
@@ -35,6 +35,7 @@ struct mdp_cmdq_cmd {
        struct mdp_comp *comps;
        void *mdp_ctx;
        u8 num_comps;
+       u8 pp_idx;
 };
 
 struct mdp_dev;