From fb2ea0c6bcba1234c432957396143a99e327afdc Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Thu, 2 Nov 2023 09:55:51 +0800 Subject: [PATCH] drm/rockchip: vop2: fix NULL point when dump regs or active_regs when vp0 is disabled, the vop2->vps[0].rockchip_crtc.crtc.state is NULL. Signed-off-by: Sandy Huang Change-Id: I93b3ea4f3ddc6076f2105ebcabf7317627b602a3 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index b3f403358d83..31b3abb531e3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -6326,7 +6326,8 @@ static void vop2_crtc_regs_dump(struct drm_crtc *crtc, struct seq_file *s) /* only need to dump once at first active crtc for vop2 */ for (i = 0; i < vop2_data->nr_vps; i++) { - if (vop2->vps[i].rockchip_crtc.crtc.state->active) { + if (vop2->vps[i].rockchip_crtc.crtc.state && + vop2->vps[i].rockchip_crtc.crtc.state->active) { first_active_crtc = &vop2->vps[i].rockchip_crtc.crtc; break; } @@ -6369,7 +6370,8 @@ static void vop2_crtc_active_regs_dump(struct drm_crtc *crtc, struct seq_file *s /* only need to dump once at first active crtc for vop2 */ for (i = 0; i < vop2_data->nr_vps; i++) { - if (vop2->vps[i].rockchip_crtc.crtc.state->active) { + if (vop2->vps[i].rockchip_crtc.crtc.state && + vop2->vps[i].rockchip_crtc.crtc.state->active) { first_active_crtc = &vop2->vps[i].rockchip_crtc.crtc; break; }