drm/amd/display: Remove invalid assert for ODM + MPC case

Eric Bernstein · gregkh · commit ae311a7418f1 · 2021-08-18T08:59:07.000+02:00
commit c90f626 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>
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -1875,7 +1875,6 @@ static bool dcn30_split_stream_for_mpc_or_odm(`
`1875`	`1875`	`}`
`1876`	`1876`	`pri_pipe->next_odm_pipe = sec_pipe;`
`1877`	`1877`	`sec_pipe->prev_odm_pipe = pri_pipe;`
`1878`		`- ASSERT(sec_pipe->top_pipe == NULL);`
`1879`	`1878`
`1880`	`1879`	`sec_pipe->stream_res.opp = pool->opps[pipe_idx];`
`1881`	`1880`	`if (sec_pipe->stream->timing.flags.DSC == 1) {`