drm/amd/display: Remove invalid assert for ODM + MPC case
authorEric Bernstein <eric.bernstein@amd.com>
Mon, 26 Jul 2021 19:53:18 +0000 (15:53 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 06:59:07 +0000 (08:59 +0200)
commit c90f6263f58a28c3d97b83679d6fd693b33dfd4e upstream.

Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Signed-off-by: Eric Bernstein <eric.bernstein@amd.com>
Cc: stable@vger.kernel.org
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

index 8465cae180da7b8965d36408c21c8aff126aa7cc..e5f4f93317cf342aa80ffdefdeb835a10f9bba6b 100644 (file)
@@ -1875,7 +1875,6 @@ static bool dcn30_split_stream_for_mpc_or_odm(
                }
                pri_pipe->next_odm_pipe = sec_pipe;
                sec_pipe->prev_odm_pipe = pri_pipe;
-               ASSERT(sec_pipe->top_pipe == NULL);
 
                sec_pipe->stream_res.opp = pool->opps[pipe_idx];
                if (sec_pipe->stream->timing.flags.DSC == 1) {