Commit 46a20c9a authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-fixes

Mediatek DRM Fixes for Linux 5.8

This include fixup for cmdq, mmsys, visibility checking and some refinement.

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200707153944.604-1-chunkuang.hu@kernel.org
parents dcb7fd82 5ab546f5

drivers/gpu/drm/mediatek/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ config DRM_MEDIATEK 
	depends on COMMON_CLK

	depends on HAVE_ARM_SMCCC

	depends on OF

	depends on MTK_MMSYS

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_HELPER

	select DRM_MIPI_DSI

	select DRM_PANEL

	select MEMORY

	select MTK_MMSYS

	select MTK_SMI

	select VIDEOMODE_HELPERS

	help

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+2 −6
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc) 
	int ret;

	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);

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

		ret = clk_prepare_enable(mtk_crtc->ddp_comp[i]->clk);

		if (ret) {
@@ -213,7 +212,6 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc) 
{

	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);

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

		clk_disable_unprepare(mtk_crtc->ddp_comp[i]->clk);

}
@@ -258,7 +256,6 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
	int ret;

	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);

	if (WARN_ON(!crtc->state))

		return -EINVAL;
@@ -299,7 +296,6 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
		goto err_mutex_unprepare;

	}



	DRM_DEBUG_DRIVER("mediatek_ddp_ddp_path_setup\n");

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

		mtk_mmsys_ddp_connect(mtk_crtc->mmsys_dev,

				      mtk_crtc->ddp_comp[i]->id,
@@ -349,7 +345,6 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) 
	struct drm_crtc *crtc = &mtk_crtc->base;

	int i;



	DRM_DEBUG_DRIVER("%s\n", __func__);

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

		mtk_ddp_comp_stop(mtk_crtc->ddp_comp[i]);

		if (i == 1)
@@ -831,7 +826,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 


#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	mtk_crtc->cmdq_client =

			cmdq_mbox_create(dev, drm_crtc_index(&mtk_crtc->base),

			cmdq_mbox_create(mtk_crtc->mmsys_dev,

					 drm_crtc_index(&mtk_crtc->base),

					 2000);

	if (IS_ERR(mtk_crtc->cmdq_client)) {

		dev_dbg(dev, "mtk_crtc %d failed to create mailbox client, writing register by CPU now\n",

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+2 −4
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ static int mtk_drm_probe(struct platform_device *pdev) 
	if (!private)

		return -ENOMEM;



	private->data = of_device_get_match_data(dev);

	private->mmsys_dev = dev->parent;

	if (!private->mmsys_dev) {

		dev_err(dev, "Failed to get MMSYS device\n");
@@ -514,7 +513,8 @@ static int mtk_drm_probe(struct platform_device *pdev) 
				goto err_node;

			}



			ret = mtk_ddp_comp_init(dev, node, comp, comp_id, NULL);

			ret = mtk_ddp_comp_init(dev->parent, node, comp,

						comp_id, NULL);

			if (ret) {

				of_node_put(node);

				goto err_node;
@@ -571,7 +571,6 @@ static int mtk_drm_sys_suspend(struct device *dev) 
	int ret;



	ret = drm_mode_config_helper_suspend(drm);

	DRM_DEBUG_DRIVER("mtk_drm_sys_suspend\n");



	return ret;

}
@@ -583,7 +582,6 @@ static int mtk_drm_sys_resume(struct device *dev) 
	int ret;



	ret = drm_mode_config_helper_resume(drm);

	DRM_DEBUG_DRIVER("mtk_drm_sys_resume\n");



	return ret;

}

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+15 −10
Original line number Diff line number Diff line
@@ -164,6 +164,16 @@ static int mtk_plane_atomic_check(struct drm_plane *plane, 
						   true, true);

}



static void mtk_plane_atomic_disable(struct drm_plane *plane,

				     struct drm_plane_state *old_state)

{

	struct mtk_plane_state *state = to_mtk_plane_state(plane->state);



	state->pending.enable = false;

	wmb(); /* Make sure the above parameter is set before update */

	state->pending.dirty = true;

}



static void mtk_plane_atomic_update(struct drm_plane *plane,

				    struct drm_plane_state *old_state)

{
@@ -178,6 +188,11 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
	if (!crtc || WARN_ON(!fb))

		return;



	if (!plane->state->visible) {

		mtk_plane_atomic_disable(plane, old_state);

		return;

	}



	gem = fb->obj[0];

	mtk_gem = to_mtk_gem_obj(gem);

	addr = mtk_gem->dma_addr;
@@ -200,16 +215,6 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
	state->pending.dirty = true;

}



static void mtk_plane_atomic_disable(struct drm_plane *plane,

				     struct drm_plane_state *old_state)

{

	struct mtk_plane_state *state = to_mtk_plane_state(plane->state);



	state->pending.enable = false;

	wmb(); /* Make sure the above parameter is set before update */

	state->pending.dirty = true;

}



static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {

	.prepare_fb = drm_gem_fb_prepare_fb,

	.atomic_check = mtk_plane_atomic_check,

drivers/gpu/drm/mediatek/mtk_dsi.c

+1 −4
Original line number Diff line number Diff line
@@ -316,10 +316,7 @@ static void mtk_dsi_lane0_ulp_mode_leave(struct mtk_dsi *dsi) 


static bool mtk_dsi_clk_hs_state(struct mtk_dsi *dsi)

{

	u32 tmp_reg1;



	tmp_reg1 = readl(dsi->regs + DSI_PHY_LCCON);

	return ((tmp_reg1 & LC_HS_TX_EN) == 1) ? true : false;

	return readl(dsi->regs + DSI_PHY_LCCON) & LC_HS_TX_EN;

}



static void mtk_dsi_clk_hs_mode(struct mtk_dsi *dsi, bool enter)

CRA Git | Maintained and supported by SUSTech CRA and CCSE