Commit 6011106d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-fixes-5.15' of... 

Merge tag 'mediatek-drm-fixes-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-fixes

Mediatek DRM Fixes for Linux 5.15

1. Revert series "CMDQ refinement of Mediatek DRM driver"

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211013235044.5488-1-chunkuang.hu@kernel.org
parents 1483f0a4 4157a441

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+24 −133
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 */



#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>
@@ -52,11 +50,8 @@ 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_pkt			cmdq_handle;

	struct cmdq_client		*cmdq_client;

	u32				cmdq_event;

	u32				cmdq_vblank_cnt;

#endif



	struct device			*mmsys_dev;
@@ -227,79 +222,9 @@ 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 void ddp_cmdq_cb(struct cmdq_cb_data data)

{

	struct device *dev;

	dma_addr_t dma_addr;



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

	if (!pkt->va_base) {

		kfree(pkt);

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

	}



	pkt->pa_base = dma_addr;



	return 0;

}



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;

	struct mtk_crtc_state *state;

	unsigned int i;



	state = to_mtk_crtc_state(mtk_crtc->base.state);



	state->pending_config = false;



	if (mtk_crtc->pending_planes) {

		for (i = 0; i < mtk_crtc->layer_nr; i++) {

			struct drm_plane *plane = &mtk_crtc->planes[i];

			struct mtk_plane_state *plane_state;



			plane_state = to_mtk_plane_state(plane->state);



			plane_state->pending.config = false;

		}

		mtk_crtc->pending_planes = false;

	}



	if (mtk_crtc->pending_async_planes) {

		for (i = 0; i < mtk_crtc->layer_nr; i++) {

			struct drm_plane *plane = &mtk_crtc->planes[i];

			struct mtk_plane_state *plane_state;



			plane_state = to_mtk_plane_state(plane->state);



			plane_state->pending.async_config = false;

		}

		mtk_crtc->pending_async_planes = false;

	}



	mtk_crtc->cmdq_vblank_cnt = 0;

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

	cmdq_pkt_destroy(data.data);

}

#endif
@@ -453,7 +378,6 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
				    state->pending_vrefresh, 0,

				    cmdq_handle);



		if (!cmdq_handle)

		state->pending_config = false;

	}
@@ -474,11 +398,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
				mtk_ddp_comp_layer_config(comp, local_layer,

							  plane_state,

							  cmdq_handle);

			if (!cmdq_handle)

			plane_state->pending.config = false;

		}



		if (!cmdq_handle)

		mtk_crtc->pending_planes = false;

	}
@@ -499,11 +420,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
				mtk_ddp_comp_layer_config(comp, local_layer,

							  plane_state,

							  cmdq_handle);

			if (!cmdq_handle)

			plane_state->pending.async_config = false;

		}



		if (!cmdq_handle)

		mtk_crtc->pending_async_planes = false;

	}

}
@@ -512,7 +430,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;
@@ -550,24 +468,14 @@ 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->cmd_buf_size = 0;

	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,

					    cmdq_handle->pa_base,

					    cmdq_handle->cmd_buf_size,

					    DMA_TO_DEVICE);

		/*

		 * CMDQ command should execute in next vblank,

		 * If it fail to execute in next 2 vblank, timeout happen.

		 */

		mtk_crtc->cmdq_vblank_cnt = 2;

		mbox_send_message(mtk_crtc->cmdq_chan, cmdq_handle);

		mbox_client_txdone(mtk_crtc->cmdq_chan, 0);

		cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);

	}

#endif

	mtk_crtc->config_updating = false;
@@ -581,15 +489,12 @@ 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)

		mtk_crtc_ddp_config(crtc, NULL);

	else if (mtk_crtc->cmdq_vblank_cnt > 0 && --mtk_crtc->cmdq_vblank_cnt == 0)

		DRM_ERROR("mtk_crtc %d CMDQ execute command timeout!\n",

			  drm_crtc_index(&mtk_crtc->base));

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

#else

	if (!priv->data->shadow_register)

		mtk_crtc_ddp_config(crtc, NULL);

#endif

		mtk_crtc_ddp_config(crtc, NULL);



	mtk_drm_finish_page_flip(mtk_crtc);

}
@@ -924,20 +829,16 @@ 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) {

		ret = of_property_read_u32_index(priv->mutex_node,

						 "mediatek,gce-events",

						 drm_crtc_index(&mtk_crtc->base),
@@ -945,18 +846,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;

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

			}

			cmdq_mbox_destroy(mtk_crtc->cmdq_client);

			mtk_crtc->cmdq_client = NULL;

		}

	}

#endif