shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit ab1c793f457f740ab7108cc0b1340a402dbf484d ]

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: 5ddb0bd4dd ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andy Yan
2024-10-21 15:28:06 +08:00
committed by Greg Kroah-Hartman
parent cc673c7151
commit 656dbd1c21
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -1080,10 +1080,10 @@ static int vop_plane_atomic_async_check(struct drm_plane *plane,
if (!plane->state->fb) if (!plane->state->fb)
return -EINVAL; return -EINVAL;
if (state) crtc_state = drm_atomic_get_existing_crtc_state(state, new_plane_state->crtc);
crtc_state = drm_atomic_get_existing_crtc_state(state,
new_plane_state->crtc); /* Special case for asynchronous cursor updates. */
else /* Special case for asynchronous cursor updates. */ if (!crtc_state)
crtc_state = plane->crtc->state; crtc_state = plane->crtc->state;
return drm_atomic_helper_check_plane_state(plane->state, crtc_state, return drm_atomic_helper_check_plane_state(plane->state, crtc_state,