drm/mediatek: Use mailbox rx_callback instead of cmdq_task_cb

[linux-2.6-microblaze.git] / drivers / gpu / drm / mediatek / mtk_drm_crtc.c

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 474efb8..fac2f0e 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -4,6 +4,8 @@
  */
 
 #include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/mailbox_controller.h>
 #include <linux/pm_runtime.h>
 #include <linux/soc/mediatek/mtk-cmdq.h>
 #include <linux/soc/mediatek/mtk-mmsys.h>
@@ -222,9 +224,11 @@ 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 cmdq_cb_data data)
+static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg)
 {
-       cmdq_pkt_destroy(data.data);
+       struct cmdq_cb_data *data = mssg;
+
+       cmdq_pkt_destroy(data->pkt);
 }
 #endif
 
@@ -475,7 +479,12 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,
                cmdq_pkt_wfe(cmdq_handle, mtk_crtc->cmdq_event, false);
                mtk_crtc_ddp_config(crtc, cmdq_handle);
                cmdq_pkt_finalize(cmdq_handle);
-               cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);
+               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);
        }
 #endif
        mtk_crtc->config_updating = false;
@@ -755,14 +764,22 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        for (i = 0; i < path_len; i++) {
                enum mtk_ddp_comp_id comp_id = path[i];
                struct device_node *node;
+               struct mtk_ddp_comp *comp;
 
                node = priv->comp_node[comp_id];
+               comp = &priv->ddp_comp[comp_id];
+
                if (!node) {
                        dev_info(dev,
                                 "Not creating crtc %d because component %d is disabled or missing\n",
                                 pipe, comp_id);
                        return 0;
                }
+
+               if (!comp->dev) {
+                       dev_err(dev, "Component %pOF not initialized\n", node);
+                       return -ENODEV;
+               }
        }
 
        mtk_crtc = devm_kzalloc(dev, sizeof(*mtk_crtc), GFP_KERNEL);
@@ -787,16 +804,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
                enum mtk_ddp_comp_id comp_id = path[i];
                struct mtk_ddp_comp *comp;
-               struct device_node *node;
 
-               node = priv->comp_node[comp_id];
                comp = &priv->ddp_comp[comp_id];
-               if (!comp) {
-                       dev_err(dev, "Component %pOF not initialized\n", node);
-                       ret = -ENODEV;
-                       return ret;
-               }
-
                mtk_crtc->ddp_comp[i] = comp;
 
                if (comp->funcs) {
@@ -842,6 +851,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
        }
 
        if (mtk_crtc->cmdq_client) {
+               mtk_crtc->cmdq_client->client.rx_callback = ddp_cmdq_cb;
                ret = of_property_read_u32_index(priv->mutex_node,
                                                 "mediatek,gce-events",
                                                 drm_crtc_index(&mtk_crtc->base),