Skip to content

Commit c6323a2

Browse files
Eric Bernsteinalexdeucher
authored andcommitted
drm/amd/display: Updates for ODM Transition Test
[Why] There is an assert in cases where transition from ODM 2:1 to ODM 1:1 (bypass) [How] Remove assert since this case is now valid. Update diags tests for ODM transitions. Signed-off-by: Eric Bernstein <[email protected]> Reviewed-by: Dmytro Laktyushkin <[email protected]> Acked-by: Stylon Wang <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent f2700d0 commit c6323a2

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,6 @@ int dcn20_validate_apply_pipe_split_flags(
27892789
split[i] = 0;
27902790
} else if (get_num_odm_splits(pipe)) {
27912791
/* ODM -> MPC transition */
2792-
ASSERT(0); /* NOT expected yet */
27932792
if (pipe->prev_odm_pipe) {
27942793
split[i] = 0;
27952794
merge[i] = true;

0 commit comments

Comments
 (0)