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

Revert "drm/mediatek: Add cmdq_handle in mtk_crtc" 



This reverts commit bc9241be.

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 bdefc6b2

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+10 −18
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ struct mtk_drm_crtc { 
#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct mbox_client		cmdq_cl;

	struct mbox_chan		*cmdq_chan;

	struct cmdq_pkt			cmdq_handle;

	u32				cmdq_event;

	u32				cmdq_vblank_cnt;

#endif
@@ -227,16 +226,19 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc, 
}



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

static int mtk_drm_cmdq_pkt_create(struct mbox_chan *chan, struct cmdq_pkt *pkt,

				    size_t size)

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 -ENOMEM;

		return ERR_PTR(-ENOMEM);

	}

	pkt->buf_size = size;
@@ -247,12 +249,12 @@ static int mtk_drm_cmdq_pkt_create(struct mbox_chan *chan, struct cmdq_pkt *pkt, 
		dev_err(dev, "dma map failed, size=%u\n", (u32)(u64)size);

		kfree(pkt->va_base);

		kfree(pkt);

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);

	}



	pkt->pa_base = dma_addr;



	return 0;

	return pkt;

}



static void mtk_drm_cmdq_pkt_destroy(struct mbox_chan *chan, struct cmdq_pkt *pkt)
@@ -475,7 +477,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 = &mtk_crtc->cmdq_handle;

	struct cmdq_pkt *cmdq_handle;

#endif

	struct drm_crtc *crtc = &mtk_crtc->base;

	struct mtk_drm_private *priv = crtc->dev->dev_private;
@@ -515,7 +517,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc, 
#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	if (mtk_crtc->cmdq_chan) {

		mbox_flush(mtk_crtc->cmdq_chan, 2000);

		cmdq_handle->cmd_buf_size = 0;

		cmdq_handle = mtk_drm_cmdq_pkt_create(mtk_crtc->cmdq_chan, 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);
@@ -910,16 +912,6 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
				drm_crtc_index(&mtk_crtc->base));

			mbox_free_channel(mtk_crtc->cmdq_chan);

			mtk_crtc->cmdq_chan = NULL;

		} else {

			ret = mtk_drm_cmdq_pkt_create(mtk_crtc->cmdq_chan,

						       &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_chan);

				mtk_crtc->cmdq_chan = NULL;

			}

		}

	}

#endif