drm/mediatek: Add cmdq_handle in mtk_crtc

One mtk_crtc need just one cmdq_handle, so add one cmdq_handle
in mtk_crtc to prevent frequently allocation and free of
cmdq_handle.

Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: jason-jh.lin <jason-jh.lin@mediatek.com>

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index dad1f85..ffa54b4 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -53,6 +53,7 @@ struct mtk_drm_crtc {
 
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
        struct cmdq_client              cmdq_client;
+       struct cmdq_pkt                 cmdq_handle;
        u32                             cmdq_event;
        u32                             cmdq_vblank_cnt;
 #endif
@@ -107,12 +108,55 @@ static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)
        }
 }
 
+#if IS_REACHABLE(CONFIG_MTK_CMDQ)
+static int mtk_drm_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) {
+               kfree(pkt);
+               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);
+               kfree(pkt);
+               return -ENOMEM;
+       }
+
+       pkt->pa_base = dma_addr;
+
+       return 0;
+}
+
+static void mtk_drm_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);
+       kfree(pkt);
+}
+#endif
+
 static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)
 {
        struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
 
        mtk_mutex_put(mtk_crtc->mutex);
-
+#if IS_REACHABLE(CONFIG_MTK_CMDQ)
+       mtk_drm_cmdq_pkt_destroy(&mtk_crtc->cmdq_handle);
+#endif
        drm_crtc_cleanup(crtc);
 }
 
@@ -227,12 +271,10 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
 static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg)
 {
-       struct cmdq_cb_data *data = mssg;
        struct cmdq_client *cmdq_cl = container_of(cl, struct cmdq_client, client);
        struct mtk_drm_crtc *mtk_crtc = container_of(cmdq_cl, struct mtk_drm_crtc, cmdq_client);
 
        mtk_crtc->cmdq_vblank_cnt = 0;
-       cmdq_pkt_destroy(data->pkt);
 }
 #endif
 
@@ -438,7 +480,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
                                       bool needs_vblank)
 {
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
-       struct cmdq_pkt *cmdq_handle;
+       struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle;
 #endif
        struct drm_crtc *crtc = &mtk_crtc->base;
        struct mtk_drm_private *priv = crtc->dev->dev_private;
@@ -478,7 +520,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
        if (mtk_crtc->cmdq_client.chan) {
                mbox_flush(mtk_crtc->cmdq_client.chan, 2000);
-               cmdq_handle = cmdq_pkt_create(&mtk_crtc->cmdq_client, PAGE_SIZE);
+               cmdq_handle->cmd_buf_size = 0;
                cmdq_pkt_clear_event(cmdq_handle, mtk_crtc->cmdq_event);
                cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event, false);
                mtk_crtc_ddp_config(crtc, cmdq_handle);
@@ -877,6 +919,16 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                                drm_crtc_index(&mtk_crtc->base));
                        mbox_free_channel(mtk_crtc->cmdq_client.chan);
                        mtk_crtc->cmdq_client.chan = NULL;
+               } else {
+                       ret = mtk_drm_cmdq_pkt_create(&mtk_crtc->cmdq_client,
+                                                     &mtk_crtc->cmdq_handle,
+                                                     PAGE_SIZE);
+                       if (ret) {
+                               dev_dbg(dev, "mtk_crtc %d failed to create cmdq packet\n",
+                                       drm_crtc_index(&mtk_crtc->base));
+                               mbox_free_channel(mtk_crtc->cmdq_client.chan);
+                               mtk_crtc->cmdq_client.chan = NULL;
+                       }
                }
        }
 #endif