Correct a series of off by 1 errors in DML and DML2
cover Correct a series of off by 1 errors in DML and DML2
From: Mario Limonciello <[email protected]>
Many people have reported a series of issues that lead to divide by zero errors in DML2 code on DCN 3.5.
This divide by zero error is caused by accessing outside of the bound of what is initialized on an array for the number of planes.
The first patch in the series fixes the immediate issue. This patch should go to fixes and stable.
The remaining patches fix what appears to be the same problem in other code in both DML and DML2 that has (presumably) been copy/pasted for loop iterators.
Mario Limonciello (4):
drm/amd/display: Adjust plane init for off by one error drm/amd/display: Correct off by one errors in DML drm/amd/display: Correct some suspect code indentation drm/amd/display: Correct off by one errors in DML2
.../dc/dml/dcn32/display_mode_vba_32.c | 68 ++++----- .../amd/display/dc/dml2/display_mode_core.c | 131 +++++++++--------- .../src/dml2_core/dml2_core_dcn4_calcs.c | 40 +++--- .../dml21/src/dml2_core/dml2_core_shared.c | 50 +++---- 4 files changed, 144 insertions(+), 145 deletions(-)
Signature · 1 line
2.43.0
PATCH 2/4 drm/amd/display: Correct off by one errors in DML
From: Mario Limonciello <[email protected]>
Iterators of NumberOfActiveSurfaces start at zero but since the loops have a condition of <= NumberOfActiveSurfaces - 1. This will mean that the last surface isn't checked.
Adjust the condition to go all the way to NumberOfActiveSurfaces.
--- .../dc/dml/dcn32/display_mode_vba_32.c | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +34 -34
@@ -1745,7 +1745,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Scale Ratio, taps Support Check*/ mode_lib->vba.ScaleRatioAndTapsSupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { if (mode_lib->vba.ScalerEnabled[k] == false && ((mode_lib->vba.SourcePixelFormat[k] != dm_444_64 && mode_lib->vba.SourcePixelFormat[k] != dm_444_32
@@ -1791,7 +1791,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Source Format, Pixel Format and Scan Support Check*/ mode_lib->vba.SourceFormatPixelAndScanSupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.SurfaceTiling[k] == dm_sw_linear && (!(!IsVertical ((enum dm_rotation_angle ) mode_lib->vba.SourceScan[k])) || mode_lib->vba.DCCEnable[k] == true)) {
@@ -1799,7 +1799,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { dml32_CalculateBytePerPixelAndBlockSizes( mode_lib->vba.SourcePixelFormat[k], mode_lib->vba.SurfaceTiling[k],
@@ -1820,7 +1820,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }/*Bandwidth Support Check*/ -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (!IsVertical (mode_lib->vba.SourceRotation[k])) { v->SwathWidthYSingleDPP[k] = mode_lib->vba.ViewportWidth[k]; v->SwathWidthCSingleDPP[k] = mode_lib->vba.ViewportWidthChroma[k];
@@ -1829,14 +1829,14 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l v->SwathWidthCSingleDPP[k] = mode_lib->vba.ViewportHeightChroma[k]; } } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { v->ReadBandwidthLuma[k] = v->SwathWidthYSingleDPP[k] *dml_ceil (v->BytePerPixelInDETY[k],1.0 ) / (mode_lib->vba.HTotal[k] / mode_lib->vba.PixelClock[k]) * mode_lib->vba.VRatio[k]; v->ReadBandwidthChroma[k] = v->SwathWidthYSingleDPP[k] /2 *dml_ceil (v->BytePerPixelInDETC[k],2.0 ) / (mode_lib->vba.HTotal[k] / mode_lib->vba.PixelClock[k]) * mode_lib->vba.VRatio[k] /2.0 ; } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.WritebackEnable[k] == true && mode_lib->vba.WritebackPixelFormat[k] == dm_444_64) { v->WriteBandwidth[k] = mode_lib->vba.WritebackDestinationWidth[k] * mode_lib->vba.WritebackDestinationHeight[k]
@@ -1855,7 +1855,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Writeback Latency support check*/ mode_lib->vba.WritebackLatencySupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { if (mode_lib->vba.WritebackEnable[k] == true && (v->WriteBandwidth[k] > mode_lib->vba.WritebackInterfaceBufferSize * 1024
@@ -1867,7 +1867,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Writeback Mode Support Check*/ mode_lib->vba.EnoughWritebackUnits = true; mode_lib->vba.TotalNumberOfActiveWriteback =0 ; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.WritebackEnable[k] == true) mode_lib->vba.TotalNumberOfActiveWriteback = mode_lib->vba.TotalNumberOfActiveWriteback +1 ; }
@@ -1877,7 +1877,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Writeback Scale Ratio and Taps Support Check*/ mode_lib->vba.WritebackScaleRatioAndTapsSupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.WritebackEnable[k] == true) {if (mode_lib->vba.WritebackHRatio[k] > mode_lib->vba.WritebackMaxHSCLRatio || mode_lib->vba.WritebackVRatio[k] > mode_lib->vba.WritebackMaxVSCLRatio
@@ -1898,7 +1898,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { dml32_CalculateSinglePipeDPPCLKAndSCLThroughput(mode_lib->vba.HRatio[k], mode_lib->vba.HRatioChroma[k], mode_lib->vba.VRatio[k], mode_lib->vba.VRatioChroma[k], mode_lib->vba.MaxDCHUBToPSCLThroughput, mode_lib->vba.MaxPSCLToLBThroughput,
@@ -1910,7 +1910,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &mode_lib->vba.MinDPPCLKUsingSingleDPP[k]); } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.SurfaceTiling[k] == dm_sw_linear) { v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.MaximumSwathWidthSupportLuma =8192 ;
@@ -2298,7 +2298,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/* Display IO and DSC Support Check */ mode_lib->vba.NonsupportedDSCInputBPC = false; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (!(mode_lib->vba.DSCInputBitPerComponent[k] ==12.0 || mode_lib->vba.DSCInputBitPerComponent[k] ==10.0 || mode_lib->vba.DSCInputBitPerComponent[k] == 8.0)
@@ -2447,7 +2447,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (i = start_state; i < v->soc.num_states; i++) { mode_lib->vba.DSCCLKRequiredMoreThanSupported[i] = false; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.BlendingAndTiming[k] == k) {if (mode_lib->vba.Output[k] == dm_dp || mode_lib->vba.Output[k] == dm_dp2p0 || mode_lib->vba.Output[k] == dm_edp) {
@@ -2529,9 +2529,9 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.ip.dsc_delay_factor_wa); } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { -for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces -1 ; m++) { -for (j =0 ; j <= mode_lib->vba.NumberOfActiveSurfaces -1 ; j++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { +for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces; m++) { +for (j =0 ; j <= mode_lib->vba.NumberOfActiveSurfaces; j++) {if (mode_lib->vba.BlendingAndTiming[k] == m && mode_lib->vba.RequiresDSC[i][m] == true) { mode_lib->vba.DSCDelayPerState[i][k] =
@@ -2684,7 +2684,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (i = start_state; i < v->soc.num_states; i++) {for (j =0 ; j <2 ; j++) { -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { mode_lib->vba.swath_width_luma_ub_this_state[k] = mode_lib->vba.swath_width_luma_ub_all_states[i][j][k]; mode_lib->vba.swath_width_chroma_ub_this_state[k] =
@@ -2911,7 +2911,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l//Calculate Return BW for (i = start_state; i < (int ) v->soc.num_states; ++i) {for (j =0 ; j <=1 ; ++j) { -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.BlendingAndTiming[k] == k) {if (mode_lib->vba.WritebackEnable[k] == true) { mode_lib->vba.WritebackDelayTime[k] =
@@ -2929,7 +2929,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }else { mode_lib->vba.WritebackDelayTime[k] =0.0 ; } -for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces -1 ; m++) { +for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces; m++) {if (mode_lib->vba.BlendingAndTiming[m] == k && mode_lib->vba.WritebackEnable[m] == true) { mode_lib->vba.WritebackDelayTime[k] =
@@ -2949,8 +2949,8 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { -for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces -1 ; m++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { +for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces; m++) {if (mode_lib->vba.BlendingAndTiming[k] == m) { mode_lib->vba.WritebackDelayTime[k] = mode_lib->vba.WritebackDelayTime[m];
@@ -2958,7 +2958,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } mode_lib->vba.MaxMaxVStartup[i][j] =0 ; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { mode_lib->vba.MaximumVStartup[i][j][k] = ((mode_lib->vba.Interlace[k] && !mode_lib->vba.ProgressiveToInterlaceUnitInOPP) ? dml_floor((mode_lib->vba.VTotal[k] -
@@ -3254,7 +3254,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.PrefetchModePerState[i][j] = v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.NextPrefetchModeState; mode_lib->vba.MaxVStartup = mode_lib->vba.NextMaxVStartup; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { mode_lib->vba.TWait = dml32_CalculateTWait( mode_lib->vba.PrefetchModePerState[i][j], mode_lib->vba.UsesMALLForPStateChange[k],
@@ -3343,7 +3343,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.dummy_single[4]); // unsigned int *VReadyOffsetPix } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { dml32_CalculateUrgentBurstFactor( mode_lib->vba.UsesMALLForPStateChange[k], mode_lib->vba.swath_width_luma_ub_this_state[k],
@@ -3400,7 +3400,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &mode_lib->vba.PrefetchSupported[i][j]); } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.LineTimesForPrefetch[k] <2.0 || mode_lib->vba.LinesForMetaPTE[k] >=32.0 || mode_lib->vba.LinesForMetaAndDPTERow[k] >= 16.0
@@ -3416,7 +3416,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } mode_lib->vba.VRatioInPrefetchSupported[i][j] = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.VRatioPreY[i][j][k] > mode_lib->vba.MaxVRatioPre || mode_lib->vba.VRatioPreC[i][j][k] > mode_lib->vba.MaxVRatioPre || mode_lib->vba.NoTimeForPrefetch[i][j][k] == true) {
@@ -3452,7 +3452,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.UrgentBurstFactorCursorPre); mode_lib->vba.TotImmediateFlipBytes =0.0 ; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (!(mode_lib->vba.ImmediateFlipRequirement[k] == dm_immediate_flip_not_required)) { mode_lib->vba.TotImmediateFlipBytes =
@@ -3472,7 +3472,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { dml32_CalculateFlipSchedule(v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.HostVMInefficiencyFactor, mode_lib->vba.ExtraLatency, mode_lib->vba.UrgLatency[i],
@@ -3533,7 +3533,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l &mode_lib->vba.ImmediateFlipSupportedForState[i][j]); // Boolean *ImmediateFlipBandwidthSupport } -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { if (!(mode_lib->vba.ImmediateFlipRequirement[k] == dm_immediate_flip_not_required) && (mode_lib->vba.ImmediateFlipSupportedForPipe[k]
@@ -3618,7 +3618,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Cursor Support Check*/ mode_lib->vba.CursorSupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.CursorWidth[k][0 ] >0.0 ) {if (mode_lib->vba.CursorBPP[k][0 ] ==64 && mode_lib->vba.Cursor64BppSupport == false) mode_lib->vba.CursorSupport = false;
@@ -3627,7 +3627,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/*Valid Pitch Check*/ mode_lib->vba.PitchSupport = true; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { mode_lib->vba.AlignedYPitch[k] =dml_ceil (dml_max (mode_lib->vba.PitchY[k], mode_lib->vba.SurfaceWidthY[k]), mode_lib->vba.MacroTileWidthY[k]);
@@ -3667,7 +3667,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } mode_lib->vba.ViewportExceedsSurface = false; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.ViewportWidth[k] > mode_lib->vba.SurfaceWidthY[k] || mode_lib->vba.ViewportHeight[k] > mode_lib->vba.SurfaceHeightY[k]) { mode_lib->vba.ViewportExceedsSurface = true;
@@ -3711,7 +3711,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.CompressedBufferSizeInkByte = mode_lib->vba.CompressedBufferSizeInkByteAllStates[mode_lib->vba.VoltageLevel][MaximumMPCCombine];// Not used, informational -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) { mode_lib->vba.MPCCombineEnable[k] = mode_lib->vba.MPCCombine[mode_lib->vba.VoltageLevel][MaximumMPCCombine][k]; mode_lib->vba.DPPPerPlane[k] = mode_lib->vba.NoOfDPP[mode_lib->vba.VoltageLevel][MaximumMPCCombine][k];
@@ -3737,7 +3737,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.DISPCLK = mode_lib->vba.RequiredDISPCLK[mode_lib->vba.VoltageLevel][MaximumMPCCombine]; mode_lib->vba.maxMpcComb = MaximumMPCCombine; -for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { +for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces; k++) {if (mode_lib->vba.BlendingAndTiming[k] == k) { mode_lib->vba.ODMCombineEnabled[k] = mode_lib->vba.ODMCombineEnablePerState[mode_lib->vba.VoltageLevel][k];
Signature · 1 line
2.43.0
PATCH 1/4 drm/amd/display: Adjust plane init for off by one error
In reply to Mario LimoncielloFrom: Mario Limonciello <[email protected]>
The number of active surfaces is initialized to the number of active planes. If the number of planes aren't initialized properly then the last plane can end up not getting initialized which can be a divide by zero error.
--- drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +1 -1
@@ -6787,7 +6787,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateBytePerPixelAndBlockSizes( mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k], mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k],
Signature · 1 line
2.43.0
PATCH 3/4 drm/amd/display: Correct some suspect code indentation
In reply to Mario LimoncielloFrom: Mario Limonciello <[email protected]>
The indentation for some lines in DML2 code is off and checkpatch reported it while fixing another issue.
```
WARNING: suspect code indent for conditional statements (24, 40)
46: FILE: drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c:6416:
+ for (k = 0; k <= mode_lib->ms.num_active_planes; k++) {
CalculateUrgentBurstFactor(
WARNING: suspect code indent for conditional statements (8, 24)
118: FILE: drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c:6784:
+ for (k = 0; k <= mode_lib->ms.num_active_planes; k++) {
if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear && (!(!dml_is_vertical_rotation(mode_lib->ms.cache_display_cfg.plane.SourceScan[k])) || mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) {
```Correct indentation for those two cases.
--- .../amd/display/dc/dml2/display_mode_core.c | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +27 -28
@@ -6414,32 +6414,32 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) }for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { -CalculateUrgentBurstFactor ( - mode_lib->ms.cache_display_cfg.plane.UseMALLForPStateChange[k], - mode_lib->ms.swath_width_luma_ub_this_state[k], - mode_lib->ms.swath_width_chroma_ub_this_state[k], - mode_lib->ms.SwathHeightYThisState[k], - mode_lib->ms.SwathHeightCThisState[k], - mode_lib->ms.cache_display_cfg.timing.HTotal[k] / mode_lib->ms.cache_display_cfg.timing.PixelClock[k], - mode_lib->ms.UrgLatency, - mode_lib->ms.ip.cursor_buffer_size, - mode_lib->ms.cache_display_cfg.plane.CursorWidth[k], - mode_lib->ms.cache_display_cfg.plane.CursorBPP[k], - mode_lib->ms.VRatioPreY[j][k], - mode_lib->ms.VRatioPreC[j][k], - mode_lib->ms.BytePerPixelInDETY[k], - mode_lib->ms.BytePerPixelInDETC[k], - mode_lib->ms.DETBufferSizeYThisState[k], - mode_lib->ms.DETBufferSizeCThisState[k], -/* Output */ - &mode_lib->ms.UrgentBurstFactorCursorPre[k], - &mode_lib->ms.UrgentBurstFactorLumaPre[k], - &mode_lib->ms.UrgentBurstFactorChroma[k], - &mode_lib->ms.NotUrgentLatencyHidingPre[k]); - - mode_lib->ms.cursor_bw_pre[k] = mode_lib->ms.cache_display_cfg.plane.NumberOfCursors[k] * mode_lib->ms.cache_display_cfg.plane.CursorWidth[k] * - mode_lib->ms.cache_display_cfg.plane.CursorBPP[k] /8.0 / (mode_lib->ms.cache_display_cfg.timing.HTotal[k] / - mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) * mode_lib->ms.VRatioPreY[j][k]; +CalculateUrgentBurstFactor ( + mode_lib->ms.cache_display_cfg.plane.UseMALLForPStateChange[k], + mode_lib->ms.swath_width_luma_ub_this_state[k], + mode_lib->ms.swath_width_chroma_ub_this_state[k], + mode_lib->ms.SwathHeightYThisState[k], + mode_lib->ms.SwathHeightCThisState[k], + mode_lib->ms.cache_display_cfg.timing.HTotal[k] / mode_lib->ms.cache_display_cfg.timing.PixelClock[k], + mode_lib->ms.UrgLatency, + mode_lib->ms.ip.cursor_buffer_size, + mode_lib->ms.cache_display_cfg.plane.CursorWidth[k], + mode_lib->ms.cache_display_cfg.plane.CursorBPP[k], + mode_lib->ms.VRatioPreY[j][k], + mode_lib->ms.VRatioPreC[j][k], + mode_lib->ms.BytePerPixelInDETY[k], + mode_lib->ms.BytePerPixelInDETC[k], + mode_lib->ms.DETBufferSizeYThisState[k], + mode_lib->ms.DETBufferSizeCThisState[k], +/* Output */ + &mode_lib->ms.UrgentBurstFactorCursorPre[k], + &mode_lib->ms.UrgentBurstFactorLumaPre[k], + &mode_lib->ms.UrgentBurstFactorChroma[k], + &mode_lib->ms.NotUrgentLatencyHidingPre[k]); + + mode_lib->ms.cursor_bw_pre[k] = mode_lib->ms.cache_display_cfg.plane.NumberOfCursors[k] * mode_lib->ms.cache_display_cfg.plane.CursorWidth[k] * + mode_lib->ms.cache_display_cfg.plane.CursorBPP[k] /8.0 / (mode_lib->ms.cache_display_cfg.timing.HTotal[k] / + mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) * mode_lib->ms.VRatioPreY[j][k]; } {
@@ -6782,9 +6782,8 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Source Format, Pixel Format and Scan Support Check*/ mode_lib->ms.support.SourceFormatPixelAndScanSupport = true;for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { -if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear && (!(!dml_is_vertical_rotation (mode_lib->ms.cache_display_cfg.plane.SourceScan[k])) || mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) { +if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear && (!(!dml_is_vertical_rotation (mode_lib->ms.cache_display_cfg.plane.SourceScan[k])) || mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) mode_lib->ms.support.SourceFormatPixelAndScanSupport = false; - } }for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {
Signature · 1 line
2.43.0
PATCH 4/4 drm/amd/display: Correct off by one errors in DML2
In reply to Mario LimoncielloFrom: Mario Limonciello <[email protected]>
Iterators of num_active_planes start at zero but since the loops have a condition of <= num_active_planes - 1. This will mean that the last plane isn't checked.
Adjust the condition to go all the way to num_acftive_planes.
--- .../amd/display/dc/dml2/display_mode_core.c | 74 +++++++++---------- .../src/dml2_core/dml2_core_dcn4_calcs.c | 40 +++++----- .../dml21/src/dml2_core/dml2_core_shared.c | 50 ++++++------- 3 files changed, 82 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +37 -37
@@ -6338,7 +6338,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) s->NextMaxVStartup = s->MaxVStartupAllPlanes[j]; s->MaxVStartup =0 ; s->AllPrefetchModeTested = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {CalculatePrefetchMode (mode_lib->ms.policy.AllowForPStateChangeOrStutterInVBlank[k], &s->MinPrefetchMode[k], &s->MaxPrefetchMode[k]); s->NextPrefetchMode[k] = s->MinPrefetchMode[k]; }
@@ -6347,7 +6347,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) s->MaxVStartup = s->NextMaxVStartup; s->AllPrefetchModeTested = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.PrefetchMode[k] = s->NextPrefetchMode[k]; mode_lib->ms.TWait = CalculateTWait( mode_lib->ms.PrefetchMode[k],
@@ -6413,7 +6413,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) CalculatePrefetchSchedule_params); } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateUrgentBurstFactor( mode_lib->ms.cache_display_cfg.plane.UseMALLForPStateChange[k], mode_lib->ms.swath_width_luma_ub_this_state[k],
@@ -6472,7 +6472,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) &mode_lib->ms.support.PrefetchSupported[j]); } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.LineTimesForPrefetch[k] <2.0 || mode_lib->ms.LinesForMetaPTE[k] >=32.0 || mode_lib->ms.LinesForMetaAndDPTERow[k] >= 16.0
@@ -6489,7 +6489,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) } mode_lib->ms.support.VRatioInPrefetchSupported[j] = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { if (mode_lib->ms.support.NoTimeForPrefetch[j][k] == true || mode_lib->ms.VRatioPreY[j][k] > __DML_MAX_VRATIO_PRE_ENHANCE_PREFETCH_ACC__ || mode_lib->ms.VRatioPreC[j][k] > __DML_MAX_VRATIO_PRE_ENHANCE_PREFETCH_ACC__ ||
@@ -6525,7 +6525,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) mode_lib->ms.UrgentBurstFactorCursorPre); mode_lib->ms.TotImmediateFlipBytes =0 ; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (!(mode_lib->ms.policy.ImmediateFlipRequirement[k] == dml_immediate_flip_not_required)) { mode_lib->ms.TotImmediateFlipBytes = mode_lib->ms.TotImmediateFlipBytes + mode_lib->ms.NoOfDPP[j][k] * mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k] + mode_lib->ms.MetaRowBytes[j][k];if (mode_lib->ms.use_one_row_for_frame_flip[j][k]) {
@@ -6536,7 +6536,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateFlipSchedule( s->HostVMInefficiencyFactor, mode_lib->ms.ExtraLatency,
@@ -6600,7 +6600,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) &mode_lib->ms.support.ImmediateFlipSupportedForState[j]); // dml_bool_t *ImmediateFlipBandwidthSupport } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (!(mode_lib->ms.policy.ImmediateFlipRequirement[k] == dml_immediate_flip_not_required) && (mode_lib->ms.ImmediateFlipSupportedForPipe[k] == false)) mode_lib->ms.support.ImmediateFlipSupportedForState[j] = false; }
@@ -6611,7 +6611,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib)if (s->MaxVStartup <= __DML_VBA_MIN_VSTARTUP__ || s->AnyLinesForVMOrRowTooLarge == false) { s->NextMaxVStartup = s->MaxVStartupAllPlanes[j]; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { s->NextPrefetchMode[k] = s->NextPrefetchMode[k] +1 ;if (s->NextPrefetchMode[k] <= s->MaxPrefetchMode[k])
@@ -6742,7 +6742,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Scale Ratio, taps Support Check*/ mode_lib->ms.support.ScaleRatioAndTapsSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { if (mode_lib->ms.cache_display_cfg.plane.ScalerEnabled[k] == false && ((mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k] != dml_444_64 && mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k] != dml_444_32
@@ -6781,7 +6781,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Source Format, Pixel Format and Scan Support Check*/ mode_lib->ms.support.SourceFormatPixelAndScanSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear && (!(!dml_is_vertical_rotation (mode_lib->ms.cache_display_cfg.plane.SourceScan[k])) || mode_lib->ms.cache_display_cfg.surface.DCCEnable[k] == true)) mode_lib->ms.support.SourceFormatPixelAndScanSupport = false; }
@@ -6807,7 +6807,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) }/*Bandwidth Support Check*/ -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (!dml_is_vertical_rotation (mode_lib->ms.cache_display_cfg.plane.SourceScan[k])) { mode_lib->ms.SwathWidthYSingleDPP[k] = mode_lib->ms.cache_display_cfg.plane.ViewportWidth[k]; mode_lib->ms.SwathWidthCSingleDPP[k] = mode_lib->ms.cache_display_cfg.plane.ViewportWidthChroma[k];
@@ -6816,11 +6816,11 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) mode_lib->ms.SwathWidthCSingleDPP[k] = mode_lib->ms.cache_display_cfg.plane.ViewportHeightChroma[k]; } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.ReadBandwidthLuma[k] = mode_lib->ms.SwathWidthYSingleDPP[k] *dml_ceil (mode_lib->ms.BytePerPixelInDETY[k],1.0 ) / (mode_lib->ms.cache_display_cfg.timing.HTotal[k] / mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) * mode_lib->ms.cache_display_cfg.plane.VRatio[k]; mode_lib->ms.ReadBandwidthChroma[k] = mode_lib->ms.SwathWidthYSingleDPP[k] /2 *dml_ceil (mode_lib->ms.BytePerPixelInDETC[k],2.0 ) / (mode_lib->ms.cache_display_cfg.timing.HTotal[k] / mode_lib->ms.cache_display_cfg.timing.PixelClock[k]) * mode_lib->ms.cache_display_cfg.plane.VRatio[k] /2.0 ; } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true && mode_lib->ms.cache_display_cfg.writeback.WritebackPixelFormat[k] == dml_444_64) { mode_lib->ms.WriteBandwidth[k] = mode_lib->ms.cache_display_cfg.writeback.WritebackDestinationWidth[k]
@@ -6841,7 +6841,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Writeback Latency support check*/ mode_lib->ms.support.WritebackLatencySupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true && (mode_lib->ms.WriteBandwidth[k] > mode_lib->ms.ip.writeback_interface_buffer_size_kbytes *1024 / mode_lib->ms.state.writeback_latency_us)) { mode_lib->ms.support.WritebackLatencySupport = false;
@@ -6850,7 +6850,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Writeback Mode Support Check*/ s->TotalNumberOfActiveWriteback =0 ; -for (k =0 ; k <= (dml_uint_t ) mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= (dml_uint_t ) mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true) { s->TotalNumberOfActiveWriteback = s->TotalNumberOfActiveWriteback +1 ; }
@@ -6863,7 +6863,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Writeback Scale Ratio and Taps Support Check*/ mode_lib->ms.support.WritebackScaleRatioAndTapsSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackHRatio[k] > mode_lib->ms.ip.writeback_max_hscl_ratio || mode_lib->ms.cache_display_cfg.writeback.WritebackVRatio[k] > mode_lib->ms.ip.writeback_max_vscl_ratio
@@ -6882,7 +6882,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateSinglePipeDPPCLKAndSCLThroughput( mode_lib->ms.cache_display_cfg.plane.HRatio[k], mode_lib->ms.cache_display_cfg.plane.HRatioChroma[k],
@@ -6902,7 +6902,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) &mode_lib->ms.MinDPPCLKUsingSingleDPP[k]); } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k] == dml_sw_linear) { s->MaximumSwathWidthSupportLuma =8192 ; }else if (!dml_is_vertical_rotation (mode_lib->ms.cache_display_cfg.plane.SourceScan[k]) && mode_lib->ms.BytePerPixelC[k] >0 && mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k] != dml_rgbe_alpha) {
@@ -7269,7 +7269,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/* Display IO and DSC Support Check */ mode_lib->ms.support.NonsupportedDSCInputBPC = false; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { if (mode_lib->ms.cache_display_cfg.output.OutputDisabled[k] == false && !(mode_lib->ms.cache_display_cfg.output.DSCInputBitPerComponent[k] == 12.0 || mode_lib->ms.cache_display_cfg.output.DSCInputBitPerComponent[k] == 10.0
@@ -7390,7 +7390,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } mode_lib->ms.support.DSCCLKRequiredMoreThanSupported = false; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[k] == k) { if (mode_lib->ms.cache_display_cfg.output.OutputEncoder[k] == dml_dp || mode_lib->ms.cache_display_cfg.output.OutputEncoder[k] == dml_dp2p0 ||
@@ -7482,9 +7482,9 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) mode_lib->ms.cache_display_cfg.output.PixelClockBackEnd[k]); } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { -for (m =0 ; m <= mode_lib->ms.num_active_planes -1 ; m++) { -for (j =0 ; j <= mode_lib->ms.num_active_planes -1 ; j++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { +for (m =0 ; m <= mode_lib->ms.num_active_planes; m++) { +for (j =0 ; j <= mode_lib->ms.num_active_planes; j++) {if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[k] == m && mode_lib->ms.RequiresDSC[m] == true) { mode_lib->ms.DSCDelayPerState[k] = mode_lib->ms.DSCDelayPerState[m]; }
@@ -7619,7 +7619,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) &mode_lib->ms.support.ExceededMALLSize);for (j =0 ; j <2 ; j++) { -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.swath_width_luma_ub_this_state[k] = mode_lib->ms.swath_width_luma_ub_all_states[j][k]; mode_lib->ms.swath_width_chroma_ub_this_state[k] = mode_lib->ms.swath_width_chroma_ub_all_states[j][k]; mode_lib->ms.SwathWidthYThisState[k] = mode_lib->ms.SwathWidthYAllStates[j][k];
@@ -7839,7 +7839,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)//Calculate Return BW for (j =0 ; j <2 ; ++j) { -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[k] == k) {if (mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[k] == true) { mode_lib->ms.WritebackDelayTime[k] = mode_lib->ms.state.writeback_latency_us + CalculateWriteBackDelay(
@@ -7854,7 +7854,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } else { mode_lib->ms.WritebackDelayTime[k] = 0.0; } - for (m = 0; m <= mode_lib->ms.num_active_planes - 1; m++) { + for (m = 0; m <= mode_lib->ms.num_active_planes; m++) { if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[m] == k && mode_lib->ms.cache_display_cfg.writeback.WritebackEnable[m] == true) { mode_lib->ms.WritebackDelayTime[k] = dml_max(mode_lib->ms.WritebackDelayTime[k], mode_lib->ms.state.writeback_latency_us + CalculateWriteBackDelay(
@@ -7870,8 +7870,8 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { -for (m =0 ; m <= mode_lib->ms.num_active_planes -1 ; m++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { +for (m =0 ; m <= mode_lib->ms.num_active_planes; m++) {if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[k] == m) { mode_lib->ms.WritebackDelayTime[k] = mode_lib->ms.WritebackDelayTime[m]; }
@@ -7879,7 +7879,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } s->MaxVStartupAllPlanes[j] =0 ;// max vstartup among all planes -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { s->MaximumVStartup[j][k] = CalculateMaxVStartup(k, mode_lib->ms.ip.ptoi_supported, mode_lib->ms.ip.vblank_nom_default_us,
@@ -8057,7 +8057,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Cursor Support Check*/ mode_lib->ms.support.CursorSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.plane.CursorWidth[k] >0.0 ) {if (mode_lib->ms.cache_display_cfg.plane.CursorBPP[k] ==64 && mode_lib->ms.ip.cursor_64bpp_support == false) { mode_lib->ms.support.CursorSupport = false;
@@ -8067,7 +8067,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)/*Valid Pitch Check*/ mode_lib->ms.support.PitchSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.support.AlignedYPitch[k] =dml_ceil (dml_max (mode_lib->ms.cache_display_cfg.surface.PitchY[k], mode_lib->ms.cache_display_cfg.surface.SurfaceWidthY[k]), mode_lib->ms.MacroTileWidthY[k]);
@@ -8099,7 +8099,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } mode_lib->ms.support.ViewportExceedsSurface = false; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.plane.ViewportWidth[k] > mode_lib->ms.cache_display_cfg.surface.SurfaceWidthY[k] || mode_lib->ms.cache_display_cfg.plane.ViewportHeight[k] > mode_lib->ms.cache_display_cfg.surface.SurfaceHeightY[k]) { mode_lib->ms.support.ViewportExceedsSurface = true; if (mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k] != dml_444_64 && mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k] != dml_444_32 &&
@@ -8221,7 +8221,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib)dml_print ("DML::%s: UnboundedRequestEnabled = %u\n" , __func__, mode_lib->ms.support.UnboundedRequestEnabled);dml_print ("DML::%s: CompressedBufferSizeInkByte = %u\n" , __func__, mode_lib->ms.support.CompressedBufferSizeInkByte); -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.support.MPCCombineEnable[k] = mode_lib->ms.MPCCombine[mode_lib->ms.support.MaximumMPCCombine][k]; mode_lib->ms.support.DPPPerSurface[k] = mode_lib->ms.NoOfDPP[mode_lib->ms.support.MaximumMPCCombine][k]; mode_lib->ms.SwathHeightY[k] = mode_lib->ms.SwathHeightYAllStates[mode_lib->ms.support.MaximumMPCCombine][k];
@@ -8238,7 +8238,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) mode_lib->ms.ReturnBW = mode_lib->ms.ReturnBWPerState[mode_lib->ms.support.MaximumMPCCombine]; mode_lib->ms.ReturnDRAMBW = mode_lib->ms.ReturnDRAMBWPerState[mode_lib->ms.support.MaximumMPCCombine]; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.cache_display_cfg.plane.BlendingAndTiming[k] == k) { mode_lib->ms.support.ODMMode[k] = mode_lib->ms.ODMModePerState[k]; }else {
@@ -8930,7 +8930,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc s->iteration =0 ; s->MaxTotalRDBandwidth =0 ; s->AllPrefetchModeTested = false; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {CalculatePrefetchMode (mode_lib->ms.policy.AllowForPStateChangeOrStutterInVBlank[k], &s->MinPrefetchMode[k], &s->MaxPrefetchMode[k]); s->NextPrefetchMode[k] = s->MinPrefetchMode[k]; }
@@ -9367,7 +9367,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const strucif (s->VStartupLines > s->MaxVStartupAllPlanes) { s->VStartupLines = __DML_VBA_MIN_VSTARTUP__; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { s->NextPrefetchMode[k] = s->NextPrefetchMode[k] +1 ;if (s->NextPrefetchMode[k] <= s->MaxPrefetchMode[k])
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c +20 -20
@@ -7112,7 +7112,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/*Scale Ratio, taps Support Check*/ mode_lib->ms.support.ScaleRatioAndTapsSupport = true;// Many core tests are still setting scaling parameters "incorrectly" -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { if (display_cfg->plane_descriptors[k].composition.scaler_info.enabled == false && (dml_is_420(display_cfg->plane_descriptors[k].pixel_format) || display_cfg->plane_descriptors[k].composition.scaler_info.plane0.h_ratio != 1.0
@@ -7141,13 +7141,13 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/*Source Format, Pixel Format and Scan Support Check*/ mode_lib->ms.support.SourceFormatPixelAndScanSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->plane_descriptors[k].surface.tiling == dml2_sw_linear &&dml_is_vertical_rotation (display_cfg->plane_descriptors[k].composition.rotation_angle)) { mode_lib->ms.support.SourceFormatPixelAndScanSupport = false; } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateBytePerPixelAndBlockSizes( display_cfg->plane_descriptors[k].pixel_format, display_cfg->plane_descriptors[k].surface.tiling,
@@ -7172,7 +7172,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out }/*Bandwidth Support Check*/ -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (!dml_is_vertical_rotation (display_cfg->plane_descriptors[k].composition.rotation_angle)) { mode_lib->ms.SwathWidthYSingleDPP[k] = display_cfg->plane_descriptors[k].composition.viewport.plane0.width; mode_lib->ms.SwathWidthCSingleDPP[k] = display_cfg->plane_descriptors[k].composition.viewport.plane1.width;
@@ -7182,7 +7182,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.SurfaceReadBandwidthLuma[k] = mode_lib->ms.SwathWidthYSingleDPP[k] *math_ceil2 (mode_lib->ms.BytePerPixelY[k],1.0 ) / (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 )) * display_cfg->plane_descriptors[k].composition.scaler_info.plane0.v_ratio; mode_lib->ms.SurfaceReadBandwidthChroma[k] = mode_lib->ms.SwathWidthCSingleDPP[k] *math_ceil2 (mode_lib->ms.BytePerPixelC[k],2.0 ) / (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 )) * display_cfg->plane_descriptors[k].composition.scaler_info.plane1.v_ratio;
@@ -7220,7 +7220,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/*Writeback Latency support check*/ mode_lib->ms.support.WritebackLatencySupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.enable == true && (mode_lib->ms.WriteBandwidth[k] > mode_lib->ip.writeback_interface_buffer_size_kbytes *1024 / ((double )mode_lib->soc.qos_parameters.writeback.base_latency_us))) { mode_lib->ms.support.WritebackLatencySupport = false;
@@ -7230,7 +7230,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/* Writeback Scale Ratio and Taps Support Check */ mode_lib->ms.support.WritebackScaleRatioAndTapsSupport = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.enable == true) {if (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.scaling_info.h_ratio > mode_lib->ip.writeback_max_hscl_ratio || display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.scaling_info.v_ratio > mode_lib->ip.writeback_max_vscl_ratio
@@ -7249,7 +7249,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateSinglePipeDPPCLKAndSCLThroughput( display_cfg->plane_descriptors[k].composition.scaler_info.plane0.h_ratio, display_cfg->plane_descriptors[k].composition.scaler_info.plane1.h_ratio,
@@ -7838,7 +7838,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out } mode_lib->ms.support.DSCCLKRequiredMoreThanSupported = false; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { if (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].output.output_encoder == dml2_dp || display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].output.output_encoder == dml2_dp2p0 || display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].output.output_encoder == dml2_edp ||
@@ -8263,7 +8263,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/* Output */ &mode_lib->ms.dcfclk_deepsleep); -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.enable == true) { mode_lib->ms.WritebackDelayTime[k] = mode_lib->soc.qos_parameters.writeback.base_latency_us + CalculateWriteBackDelay( display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].writeback.pixel_format,
@@ -8280,7 +8280,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out }// MaximumVStartup is actually Tvstartup_min in DCN4 programming guide -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {bool isInterlaceTiming = (display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.interlaced && !mode_lib->ip.ptoi_supported); s->MaximumVStartup[k] = CalculateMaxVStartup( mode_lib->ip.ptoi_supported,
@@ -8574,7 +8574,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out mode_lib->ms.support.urg_bandwidth_available_vm_only[dml2_core_internal_soc_state_sys_active]); mode_lib->ms.Total3dlutActive =0 ; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->plane_descriptors[k].tdlut.setup_for_tdlut) mode_lib->ms.Total3dlutActive = mode_lib->ms.Total3dlutActive +1 ;
@@ -8789,7 +8789,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out } mode_lib->ms.support.VRatioInPrefetchSupported = true; -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (mode_lib->ms.VRatioPreY[k] > __DML2_CALCS_MAX_VRATIO_PRE__ || mode_lib->ms.VRatioPreC[k] > __DML2_CALCS_MAX_VRATIO_PRE__) { mode_lib->ms.support.VRatioInPrefetchSupported = false;
@@ -8801,7 +8801,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out// Only do urg vs prefetch bandwidth check, flip schedule check, power saving feature support check IF the Prefetch Schedule Check is ok if (mode_lib->ms.support.PrefetchSupported) { -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {double line_time_us = display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 );// Calculate Urgent burst factor for prefetch #ifdef __DML_VBA_DEBUG__
@@ -8923,7 +8923,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { CalculateFlipSchedule( &mode_lib->scratch, display_cfg->plane_descriptors[k].immediate_flip,
@@ -9011,7 +9011,7 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out mode_lib->ms.support.non_urg_bandwidth_required_flip, mode_lib->ms.support.urg_bandwidth_available); -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {if (display_cfg->plane_descriptors[k].immediate_flip == true && mode_lib->ms.ImmediateFlipSupportedForPipe[k] == false) mode_lib->ms.support.ImmediateFlipSupport = false; }
@@ -9187,12 +9187,12 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_outdml2_printf ("DML::%s: ModeSupport = %u\n" , __func__, mode_lib->ms.support.ModeSupport);dml2_printf ("DML::%s: ImmediateFlipSupport = %u\n" , __func__, mode_lib->ms.support.ImmediateFlipSupport); -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.support.MPCCombineEnable[k] = mode_lib->ms.MPCCombine[k]; mode_lib->ms.support.DPPPerSurface[k] = mode_lib->ms.NoOfDPP[k]; } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) { mode_lib->ms.support.ODMMode[k] = mode_lib->ms.ODMMode[k]; mode_lib->ms.support.DSCEnabled[k] = mode_lib->ms.RequiresDSC[k]; mode_lib->ms.support.FECEnabled[k] = mode_lib->ms.RequiresFEC[k];
@@ -10524,7 +10524,7 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_ex s->TotalDCCActiveDPP = s->TotalDCCActiveDPP + mode_lib->mp.NoOfDPP[k]; }// Calculate tdlut schedule related terms -for (k =0 ; k <= s->num_active_planes -1 ; k++) { +for (k =0 ; k <= s->num_active_planes; k++) { calculate_tdlut_setting_params->dispclk_mhz = mode_lib->mp.Dispclk; calculate_tdlut_setting_params->setup_for_tdlut = display_cfg->plane_descriptors[k].tdlut.setup_for_tdlut; calculate_tdlut_setting_params->tdlut_width_mode = display_cfg->plane_descriptors[k].tdlut.tdlut_width_mode;
@@ -10967,7 +10967,7 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_ex#endif } -for (k =0 ; k <= s->num_active_planes -1 ; k++) +for (k =0 ; k <= s->num_active_planes; k++) mode_lib->mp.final_flip_bw[k] =0 ; calculate_peak_bandwidth_params->urg_vactive_bandwidth_required = mode_lib->mp.urg_vactive_bandwidth_required;
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c +25 -25
191 lines not on this page · raw message
Signature · 1 line
2.43.0
Harry Wentland
maintainerRe: [PATCH 1/4] drm/amd/display: Adjust plane init for off by one error
In reply to Mario LimoncielloQuoted 21 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
The number of active surfaces is initialized to the number of active planes. If the number of planes aren't initialized properly then the last plane can end up not getting initialized which can be a divide by zero error.
Reported-and-tested-by Luke Jones <[email protected]>Fixes 7966f319c66d9 ("drm/amd/display: Introduce DML2")Signed-off-by Mario Limonciello <[email protected]>--- drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +0
-0
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · line 6790
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +1
-1@@ -6787,7 +6787,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {
Shouldn't this be either
k <= num_active_planes -1
or
k < num_active_planes
?
Is num_active_planes wrong somehow?
Harry
Quoted 3 lines
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +0
-0CalculateBytePerPixelAndBlockSizes( mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k], mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k],
Re: [PATCH 1/4] drm/amd/display: Adjust plane init for off by one error
Quoted 36 lines · Harry Wentland
Quoted 21 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
The number of active surfaces is initialized to the number of active planes. If the number of planes aren't initialized properly then the last plane can end up not getting initialized which can be a divide by zero error.
Reported-and-tested-by Luke Jones <[email protected]>Fixes 7966f319c66d9 ("drm/amd/display: Introduce DML2")Signed-off-by Mario Limonciello <[email protected]>--- drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +0
-0drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · line 6790
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +1
-1@@ -6787,7 +6787,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) } } -for (k =0 ; k <= mode_lib->ms.num_active_planes -1 ; k++) { +for (k =0 ; k <= mode_lib->ms.num_active_planes; k++) {Shouldn't this be either
k <=num_active_planes-1
or
k <num_active_planes
?
Quoted 1 line
Is
num_active_planeswrong somehow?
Oh I see your point, that /should/ be the right value then for this particular loop and the rest of the corrections don't make sense either.
I'm not sure where the issue actually is then.
Quoted 7 lines
Harry
Quoted 3 lines
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +0
-0CalculateBytePerPixelAndBlockSizes( mode_lib->ms.cache_display_cfg.surface.SourcePixelFormat[k], mode_lib->ms.cache_display_cfg.surface.SurfaceTiling[k],