Skip to content

Commit ed6adfb

Browse files
Jason-JH.LinChun-Kuang Hu
authored andcommitted
drm/mediatek: Fix dereference before null check
Null-checking state suggests that it may be null, but it has already been dereferenced on drm_atomic_get_new_plane_state(state, plane). The parameter state will never be NULL currently, so just remove the state is NULL flow in this function. Fixes: 5ddb0bd ("drm/atomic: Pass the full state to planes async atomic check and update") Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20230714094908.13087-5-jason-jh.lin@mediatek.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent d761b94 commit ed6adfb

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/gpu/drm/mediatek/mtk_drm_plane.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,7 @@ static int mtk_plane_atomic_async_check(struct drm_plane *plane,
122122
if (ret)
123123
return ret;
124124

125-
if (state)
126-
crtc_state = drm_atomic_get_existing_crtc_state(state,
127-
new_plane_state->crtc);
128-
else /* Special case for asynchronous cursor updates. */
129-
crtc_state = new_plane_state->crtc->state;
125+
crtc_state = drm_atomic_get_existing_crtc_state(state, new_plane_state->crtc);
130126

131127
return drm_atomic_helper_check_plane_state(plane->state, crtc_state,
132128
DRM_PLANE_NO_SCALING,

0 commit comments

Comments
 (0)