Skip to content

Commit 779f3f9

Browse files
gscuigregkh
authored andcommitted
drm/vc4: kms: Fix IS_ERR() vs NULL check for vc4_kms
[ Upstream commit dba9e34 ] The drm_atomic_get_new_private_obj_state() function returns NULL on error path, drm_atomic_get_old_private_obj_state() function returns NULL on error path, too, they does not return error pointers. By the way, vc4_hvs_get_new/old_global_state() should return ERR_PTR(-EINVAL), otherwise there will be null-ptr-defer issue, such as follows: In function vc4_atomic_commit_tail(): |-- old_hvs_state = vc4_hvs_get_old_global_state(state); <-- return NULL |-- if (WARN_ON(IS_ERR(old_hvs_state))) <-- no return |-- unsigned long state_rate = max(old_hvs_state->core_clock_rate, new_hvs_state->core_clock_rate); <-- null-ptr-defer Fixes: 9ec03d7 ("drm/vc4: kms: Wait on previous FIFO users before a commit") Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20221110094445.2930509-6-cuigaosheng1@huawei.com Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 97e5b50 commit 779f3f9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/gpu/drm/vc4/vc4_kms.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ vc4_hvs_get_new_global_state(struct drm_atomic_state *state)
193193
struct drm_private_state *priv_state;
194194

195195
priv_state = drm_atomic_get_new_private_obj_state(state, &vc4->hvs_channels);
196-
if (IS_ERR(priv_state))
197-
return ERR_CAST(priv_state);
196+
if (!priv_state)
197+
return ERR_PTR(-EINVAL);
198198

199199
return to_vc4_hvs_state(priv_state);
200200
}
@@ -206,8 +206,8 @@ vc4_hvs_get_old_global_state(struct drm_atomic_state *state)
206206
struct drm_private_state *priv_state;
207207

208208
priv_state = drm_atomic_get_old_private_obj_state(state, &vc4->hvs_channels);
209-
if (IS_ERR(priv_state))
210-
return ERR_CAST(priv_state);
209+
if (!priv_state)
210+
return ERR_PTR(-EINVAL);
211211

212212
return to_vc4_hvs_state(priv_state);
213213
}

0 commit comments

Comments
 (0)