]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Check phantom_stream before it is used
authorAlex Hung <alex.hung@amd.com>
Fri, 21 Jun 2024 02:23:41 +0000 (20:23 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:00:33 +0000 (12:00 +0200)
[ Upstream commit 3718a619a8c0a53152e76bb6769b6c414e1e83f4 ]

dcn32_enable_phantom_stream can return null, so returned value
must be checked before used.

This fixes 1 NULL_RETURNS issue reported by Coverity.

Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Jerry Zuo <jerry.zuo@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c

index 9209bcad699a880f03b8ef531a4a675e389e70a3..55fbe86383c04cb2650e9baf6044b759a6cd4179 100644 (file)
@@ -1714,6 +1714,9 @@ void dcn32_add_phantom_pipes(struct dc *dc, struct dc_state *context,
        // be a valid candidate for SubVP (i.e. has a plane, stream, doesn't
        // already have phantom pipe assigned, etc.) by previous checks.
        phantom_stream = dcn32_enable_phantom_stream(dc, context, pipes, pipe_cnt, index);
+       if (!phantom_stream)
+               return;
+
        dcn32_enable_phantom_plane(dc, context, phantom_stream, index);
 
        for (i = 0; i < dc->res_pool->pipe_count; i++) {