From 2fbb7c26eca9159ca0c59a1bc81b76b54d8e2e25 Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 5 Jan 2023 11:28:01 +0800 Subject: [PATCH] drm/rockchip: vop2: memset tv state when disable crtc before this commit, the bcsh config is incorrect at the following case: vp1 -> hdmi plug in -> 1080p -> config bcsh(vp1 bcsh r2y/r2y enable) -> vp1 -> hdmi plug out -> vp0 -> hdmi plug in -> 8k(vp0 bcsh r2y/yr2 disable, vp1 bcsh r2y/r2y enable) Signed-off-by: Sandy Huang Change-Id: Icd794a3a8b5f896bd65bd243d977106117bdaac4 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index a409292ee792..f4e1f6437bc8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -4340,6 +4340,7 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, vp->splice_mode_right = false; vp->loader_protect = false; splice_vp->splice_mode_right = false; + memset(&vp->active_tv_state, 0, sizeof(vp->active_tv_state)); vop2_unlock(vop2); vop2_set_system_status(vop2);