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

drm/mediatek: Use cmdq_pkt_create() and cmdq_pkt_destroy() 



Use cmdq_pkt_create() and cmdq_pkt_destroy() common function
instead of implementing drm version.

Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20240810090918.7457-3-chunkuang.hu@kernel.org/
parent 39982603

drivers/gpu/drm/mediatek/mtk_crtc.c

+4 −42
Original line number Diff line number Diff line
@@ -113,44 +113,6 @@ static void mtk_drm_finish_page_flip(struct mtk_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)

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

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

}

#endif



static void mtk_crtc_destroy(struct drm_crtc *crtc)

{

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);
@@ -158,7 +120,7 @@ static void mtk_crtc_destroy(struct drm_crtc *crtc) 


	mtk_mutex_put(mtk_crtc->mutex);

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	mtk_drm_cmdq_pkt_destroy(&mtk_crtc->cmdq_handle);

	cmdq_pkt_destroy(&mtk_crtc->cmdq_client, &mtk_crtc->cmdq_handle);



	if (mtk_crtc->cmdq_client.chan) {

		mbox_free_channel(mtk_crtc->cmdq_client.chan);
@@ -1094,7 +1056,7 @@ int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int *path, 
			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,

			ret = cmdq_pkt_create(&mtk_crtc->cmdq_client,

					      &mtk_crtc->cmdq_handle,

					      PAGE_SIZE);

			if (ret) {