tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/rockchip: vop: Fix a dereferenced before check warning

The 'state' can't be NULL, we should check crtc_state.

Fix warning:
drivers/gpu/drm/rockchip/rockchip_drm_vop.c:1096
vop_plane_atomic_async_check() warn: variable dereferenced before check
'state' (see line 1077)

Fixes: 5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic check and update")
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241021072818.61621-1-andyshrk@163.com

authored by

Andy Yan and committed by
Heiko Stuebner ab1c793f f432a162

+4 -4
+4 -4
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 1093 1093 if (!plane->state->fb) 1094 1094 return -EINVAL; 1095 1095 1096 - if (state) 1097 - crtc_state = drm_atomic_get_existing_crtc_state(state, 1098 - new_plane_state->crtc); 1099 - else /* Special case for asynchronous cursor updates. */ 1096 + crtc_state = drm_atomic_get_existing_crtc_state(state, new_plane_state->crtc); 1097 + 1098 + /* Special case for asynchronous cursor updates. */ 1099 + if (!crtc_state) 1100 1100 crtc_state = plane->crtc->state; 1101 1101 1102 1102 return drm_atomic_helper_check_plane_state(plane->state, crtc_state,