From 69e02ae9846b6a50b94c4edf491c52c42a1ddfb9 Mon Sep 17 00:00:00 2001 From: Chaoyi Chen Date: Fri, 8 Dec 2023 11:30:25 +0800 Subject: [PATCH] drm/rockchip: vop: fix vop dynamic debug crash If the old plane state is invalid, no printing should be performed, otherwise panic will occur. Fixes: 2e409456c1f4 ("drm/rockchip: add dynamic debug for vop") Change-Id: I0687f9231c49bc068322f555f95af96a214b049d Signed-off-by: Chaoyi Chen --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d22b943e1a3a..1d415f7b2a67 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1879,12 +1879,12 @@ static void vop_plane_atomic_disable(struct drm_plane *plane, to_vop_plane_state(plane->state); #endif - rockchip_drm_dbg(vop->dev, VOP_DEBUG_PLANE, "disable win%d-area%d by %s\n", - win->win_id, win->area_id, current->comm); - if (!old_state->crtc) return; + rockchip_drm_dbg(vop->dev, VOP_DEBUG_PLANE, "disable win%d-area%d by %s\n", + win->win_id, win->area_id, current->comm); + spin_lock(&vop->reg_lock); vop_win_disable(vop, win);