drm/amd/display: remove unnecessary assert

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Chris Park <Chris.Park@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index db3fb57bf244e2a4076db9cf60b48d6601b2a5f4..9bc0ffad70931d247687d420cfd9c206e124961c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1633,7 +1633,6 @@ bool dcn20_split_stream_for_odm(
        next_odm_pipe->stream_res.dsc = NULL;
 #endif
        if (prev_odm_pipe->next_odm_pipe && prev_odm_pipe->next_odm_pipe != next_odm_pipe) {
-               ASSERT(!next_odm_pipe->next_odm_pipe);
                next_odm_pipe->next_odm_pipe = prev_odm_pipe->next_odm_pipe;
                next_odm_pipe->next_odm_pipe->prev_odm_pipe = next_odm_pipe;
        }
@@ -2398,8 +2397,8 @@ int dcn20_validate_apply_pipe_split_flags(
                        split[i] = true;
                        context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx] = true;
                }
-               context->bw_ctx.dml.vba.ODMCombineEnabled[pipe_idx]
-                       = context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx];
+               context->bw_ctx.dml.vba.ODMCombineEnabled[pipe_idx] =
+                       context->bw_ctx.dml.vba.ODMCombineEnablePerState[vlevel][pipe_idx];
                /* Adjust dppclk when split is forced, do not bother with dispclk */
                if (split[i] && context->bw_ctx.dml.vba.NoOfDPP[vlevel][context->bw_ctx.dml.vba.maxMpcComb][pipe_idx] == 1)
                        context->bw_ctx.dml.vba.RequiredDPPCLK[vlevel][context->bw_ctx.dml.vba.maxMpcComb][pipe_idx] /= 2;