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

Eric Bernstein · alexdeucher · commit c90f6263f58a · 2021-08-10T10:40:47.000-04:00
Reviewed-by: Dmytro Laktyushkin &lt;Dmytro.Laktyushkin@amd.com&gt;
Acked-by: Anson Jacob &lt;Anson.Jacob@amd.com&gt;
Signed-off-by: Eric Bernstein &lt;eric.bernstein@amd.com&gt;
Cc: stable@vger.kernel.org
Tested-by: Daniel Wheeler &lt;daniel.wheeler@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -1788,7 +1788,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);
 
 		if (!sec_pipe->top_pipe)
 			sec_pipe->stream_res.opp = pool->opps[pipe_idx];

Original file line number	Diff line number	Diff line change
`@@ -1788,7 +1788,6 @@ static bool dcn30_split_stream_for_mpc_or_odm(`
`1788`	`1788`	`}`
`1789`	`1789`	`pri_pipe->next_odm_pipe = sec_pipe;`
`1790`	`1790`	`sec_pipe->prev_odm_pipe = pri_pipe;`
`1791`		`- ASSERT(sec_pipe->top_pipe == NULL);`
`1792`	`1791`
`1793`	`1792`	`if (!sec_pipe->top_pipe)`
`1794`	`1793`	`sec_pipe->stream_res.opp = pool->opps[pipe_idx];`