Commit 7f82d9c4 authored by Yongqiang Niu's avatar Yongqiang Niu Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Clear pending flag when cmdq packet is done 



In cmdq mode, packet may be flushed before it is executed, so
the pending flag should be cleared after cmdq packet is done.

Signed-off-by: default avatarYongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: default avatarjason-jh.lin <jason-jh.lin@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 593b655f

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+46 −5
Original line number Diff line number Diff line
@@ -276,8 +276,42 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc, 
#if IS_REACHABLE(CONFIG_MTK_CMDQ)

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

{

	struct cmdq_cb_data *data = mssg;

	struct cmdq_client *cmdq_cl = container_of(cl, struct cmdq_client, client);

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

	struct mtk_crtc_state *state;

	unsigned int i;



	if (data->sta < 0)

		return;



	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;

}
@@ -433,6 +467,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
				    state->pending_vrefresh, 0,

				    cmdq_handle);



		if (!cmdq_handle)

			state->pending_config = false;

	}
@@ -453,8 +488,11 @@ 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;

	}
@@ -475,8 +513,11 @@ 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;

	}

}