Commit 8a4a099f authored by Chun-Kuang Hu's avatar Chun-Kuang Hu
Browse files

Revert "drm/mediatek: Remove struct cmdq_client" 



This reverts commit f4be17cd.

Commit c1ec54b7
("drm/mediatek: Use mailbox rx_callback instead of cmdq_task_cb")
would cause numerous mtk cmdq mailbox driver warning:

WARNING: CPU: 0 PID: 0 at drivers/mailbox/mtk-cmdq-mailbox.c:198
cmdq_task_exec_done+0xb8/0xe0

So revert that patch and all the patches depend on that patch.

Reported-by: default avatarEnric Balletbo Serra <eballetbo@gmail.com>
Tested-by: default avatarEnric Balletbo Serra <eballetbo@gmail.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 0cf54fff

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+18 −62
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ struct mtk_drm_crtc { 
	bool				pending_async_planes;



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct mbox_client		cmdq_cl;

	struct mbox_chan		*cmdq_chan;

	struct cmdq_client		*cmdq_client;

	u32				cmdq_event;

#endif
@@ -225,51 +224,11 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc, 
}



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

static struct cmdq_pkt *mtk_drm_cmdq_pkt_create(struct mbox_chan *chan, size_t size)

{

	struct cmdq_pkt *pkt;

	struct device *dev;

	dma_addr_t dma_addr;



	pkt = kzalloc(sizeof(*pkt), GFP_KERNEL);

	if (!pkt)

		return ERR_PTR(-ENOMEM);

	pkt->va_base = kzalloc(size, GFP_KERNEL);

	if (!pkt->va_base) {

		kfree(pkt);

		return ERR_PTR(-ENOMEM);

	}

	pkt->buf_size = size;



	dev = 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 ERR_PTR(-ENOMEM);

	}



	pkt->pa_base = dma_addr;



	return pkt;

}



static void mtk_drm_cmdq_pkt_destroy(struct mbox_chan *chan, struct cmdq_pkt *pkt)

{

	dma_unmap_single(chan->mbox->dev, pkt->pa_base, pkt->buf_size,

			 DMA_TO_DEVICE);

	kfree(pkt->va_base);

	kfree(pkt);

}



static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg)

{

	struct mtk_drm_crtc *mtk_crtc = container_of(cl, struct mtk_drm_crtc, cmdq_cl);

	struct cmdq_cb_data *data = mssg;



	mtk_drm_cmdq_pkt_destroy(mtk_crtc->cmdq_chan, data->pkt);

	cmdq_pkt_destroy(data->pkt);

}

#endif
@@ -513,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_chan) {

		mbox_flush(mtk_crtc->cmdq_chan, 2000);

		cmdq_handle = mtk_drm_cmdq_pkt_create(mtk_crtc->cmdq_chan, PAGE_SIZE);

	if (mtk_crtc->cmdq_client) {

		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_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_chan, cmdq_handle);

		mbox_client_txdone(mtk_crtc->cmdq_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;
@@ -539,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_chan)

	if (!priv->data->shadow_register && !mtk_crtc->cmdq_client)

#else

	if (!priv->data->shadow_register)

#endif
@@ -879,20 +838,17 @@ 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_cl.dev = mtk_crtc->mmsys_dev;

	mtk_crtc->cmdq_cl.tx_block = false;

	mtk_crtc->cmdq_cl.knows_txdone = true;

	mtk_crtc->cmdq_cl.rx_callback = ddp_cmdq_cb;

	mtk_crtc->cmdq_chan =

			mbox_request_channel(&mtk_crtc->cmdq_cl,

	mtk_crtc->cmdq_client =

			cmdq_mbox_create(mtk_crtc->mmsys_dev,

					 drm_crtc_index(&mtk_crtc->base));

	if (IS_ERR(mtk_crtc->cmdq_chan)) {

	if (IS_ERR(mtk_crtc->cmdq_client)) {

		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_chan = NULL;

		mtk_crtc->cmdq_client = NULL;

	}



	if (mtk_crtc->cmdq_chan) {

	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),
@@ -900,8 +856,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));

			mbox_free_channel(mtk_crtc->cmdq_chan);

			mtk_crtc->cmdq_chan = NULL;

			cmdq_mbox_destroy(mtk_crtc->cmdq_client);

			mtk_crtc->cmdq_client = NULL;

		}

	}

#endif