Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e84c6ae1 authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Greg Kroah-Hartman
Browse files

drm/mediatek: Check plane visibility in atomic_update 



[ Upstream commit c0b8892e2461b5fa740e47efbb1269a487b04020 ]

Disable the plane if it's not visible. Otherwise mtk_ovl_layer_config()
would proceed with invalid plane and we may see vblank timeout.

Fixes: 119f5173 ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.")
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 735929cf

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+15 −10
Original line number Diff line number Diff line
@@ -108,6 +108,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)

{
@@ -122,6 +132,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;
@@ -143,16 +158,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 = {

	.atomic_check = mtk_plane_atomic_check,

	.atomic_update = mtk_plane_atomic_update,