drm/amd/display: Remove asserts
authorHong-lu Cheng <hong-lu.cheng@amd.com>
Mon, 12 Jun 2023 17:48:53 +0000 (13:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 30 Jun 2023 17:11:35 +0000 (13:11 -0400)
[why]
Endless assert caused by LinesInDETChroma=0.

[how]
Don't floor for LinesInDETChroma=0

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Reviewed-by: Jun Lei <jun.lei@amd.com>
Acked-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Hong-lu Cheng <hong-lu.cheng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c

index 6266b07..7bf4bb7 100644 (file)
@@ -4356,12 +4356,16 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                                locals->PSCL_FACTOR[k] / locals->ReturnBWPerState[i][0],
                                                locals->EffectiveLBLatencyHidingSourceLinesLuma),
                                                locals->SwathHeightYPerState[i][j][k]);
-
-                               locals->EffectiveDETLBLinesChroma = dml_floor(locals->LinesInDETChroma + dml_min(
-                                               locals->LinesInDETChroma * locals->RequiredDISPCLK[i][j] * locals->BytePerPixelInDETC[k] *
-                                               locals->PSCL_FACTOR_CHROMA[k] / locals->ReturnBWPerState[i][0],
-                                               locals->EffectiveLBLatencyHidingSourceLinesChroma),
-                                               locals->SwathHeightCPerState[i][j][k]);
+                               if (locals->LinesInDETChroma) {
+                                       locals->EffectiveDETLBLinesChroma = dml_floor(locals->LinesInDETChroma +
+                                                   dml_min(locals->LinesInDETChroma * locals->RequiredDISPCLK[i][j] *
+                                                   locals->BytePerPixelInDETC[k] *
+                                                       locals->PSCL_FACTOR_CHROMA[k] / locals->ReturnBWPerState[i][0],
+                                                       locals->EffectiveLBLatencyHidingSourceLinesChroma),
+                                                       locals->SwathHeightCPerState[i][j][k]);
+                               } else {
+                                       locals->EffectiveDETLBLinesChroma = 0;
+                               }
 
                                if (locals->BytePerPixelInDETC[k] == 0) {
                                        locals->UrgentLatencySupportUsPerState[i][j][k] = locals->EffectiveDETLBLinesLuma * (locals->HTotal[k] / locals->PixelClock[k])