drm/mediatek: Remove the pointer of struct cmdq_client

In mailbox rx_callback, it pass struct mbox_client to callback
function, but it could not map back to mtk_drm_crtc instance
because struct cmdq_client use a pointer to struct mbox_client:

struct cmdq_client {
	struct mbox_client client;
	struct mbox_chan *chan;
};

struct mtk_drm_crtc {
	/* client instance data */
	struct cmdq_client *cmdq_client;
};

so remove the pointer of struct cmdq_client and let mtk_drm_crtc
instance define cmdq_client as:

struct mtk_drm_crtc {
	/* client instance data */
	struct cmdq_client cmdq_client;
};

and in rx_callback function, use struct mbox_client to get
struct mtk_drm_crtc.

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 369d3e6..e23e322 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -52,7 +52,7 @@ struct mtk_drm_crtc {
        bool                            pending_async_planes;
 
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
-       struct cmdq_client              *cmdq_client;
+       struct cmdq_client              cmdq_client;
        u32                             cmdq_event;
 #endif
 
@@ -472,19 +472,19 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
                mtk_mutex_release(mtk_crtc->mutex);
        }
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
-       if (mtk_crtc->cmdq_client) {
-               mbox_flush(mtk_crtc->cmdq_client->chan, 2000);
-               cmdq_handle = cmdq_pkt_create(mtk_crtc->cmdq_client, PAGE_SIZE);
+       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_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);
                cmdq_pkt_finalize(cmdq_handle);
-               dma_sync_single_for_device(mtk_crtc->cmdq_client->chan->mbox->dev,
+               dma_sync_single_for_device(mtk_crtc->cmdq_client.chan->mbox->dev,
                                           cmdq_handle->pa_base,
                                           cmdq_handle->cmd_buf_size,
                                           DMA_TO_DEVICE);
-               mbox_send_message(mtk_crtc->cmdq_client->chan, cmdq_handle);
-               mbox_client_txdone(mtk_crtc->cmdq_client->chan, 0);
+               mbox_send_message(mtk_crtc->cmdq_client.chan, cmdq_handle);
+               mbox_client_txdone(mtk_crtc->cmdq_client.chan, 0);
        }
 #endif
        mtk_crtc->config_updating = false;
@@ -498,7 +498,7 @@ static void mtk_crtc_ddp_irq(void *data)
        struct mtk_drm_private *priv = crtc->dev->dev_private;
 
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
-       if (!priv->data->shadow_register && !mtk_crtc->cmdq_client)
+       if (!priv->data->shadow_register && !mtk_crtc->cmdq_client.chan)
 #else
        if (!priv->data->shadow_register)
 #endif
@@ -838,17 +838,20 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        mutex_init(&mtk_crtc->hw_lock);
 
 #if IS_REACHABLE(CONFIG_MTK_CMDQ)
-       mtk_crtc->cmdq_client =
-                       cmdq_mbox_create(mtk_crtc->mmsys_dev,
-                                        drm_crtc_index(&mtk_crtc->base));
-       if (IS_ERR(mtk_crtc->cmdq_client)) {
+       mtk_crtc->cmdq_client.client.dev = mtk_crtc->mmsys_dev;
+       mtk_crtc->cmdq_client.client.tx_block = false;
+       mtk_crtc->cmdq_client.client.knows_txdone = true;
+       mtk_crtc->cmdq_client.client.rx_callback = ddp_cmdq_cb;
+       mtk_crtc->cmdq_client.chan =
+                       mbox_request_channel(&mtk_crtc->cmdq_client.client,
+                                            drm_crtc_index(&mtk_crtc->base));
+       if (IS_ERR(mtk_crtc->cmdq_client.chan)) {
                dev_dbg(dev, "mtk_crtc %d failed to create mailbox client, writing register by CPU now\n",
                        drm_crtc_index(&mtk_crtc->base));
-               mtk_crtc->cmdq_client = NULL;
+               mtk_crtc->cmdq_client.chan = NULL;
        }
 
-       if (mtk_crtc->cmdq_client) {
-               mtk_crtc->cmdq_client->client.rx_callback = ddp_cmdq_cb;
+       if (mtk_crtc->cmdq_client.chan) {
                ret = of_property_read_u32_index(priv->mutex_node,
                                                 "mediatek,gce-events",
                                                 drm_crtc_index(&mtk_crtc->base),
@@ -856,8 +859,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
                if (ret) {
                        dev_dbg(dev, "mtk_crtc %d failed to get mediatek,gce-events property\n",
                                drm_crtc_index(&mtk_crtc->base));
-                       cmdq_mbox_destroy(mtk_crtc->cmdq_client);
-                       mtk_crtc->cmdq_client = NULL;
+                       mbox_free_channel(mtk_crtc->cmdq_client.chan);
+                       mtk_crtc->cmdq_client.chan = NULL;
                }
        }
 #endif