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

Eric Bernstein · smb49 · commit 4e9b9a3766b7 · 2021-09-24T11:56:58.000+02:00
BugLink: https://bugs.launchpad.net/bugs/1943756 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> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c
@@ -1891,7 +1891,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
`@@ -1891,7 +1891,6 @@ static bool dcn30_split_stream_for_mpc_or_odm(`
`1891`	`1891`	`}`
`1892`	`1892`	`pri_pipe->next_odm_pipe = sec_pipe;`
`1893`	`1893`	`sec_pipe->prev_odm_pipe = pri_pipe;`
`1894`		`- ASSERT(sec_pipe->top_pipe == NULL);`
`1895`	`1894`
`1896`	`1895`	`if (!sec_pipe->top_pipe)`
`1897`	`1896`	`sec_pipe->stream_res.opp = pool->opps[pipe_idx];`