On Fri, Jul 22, 2022 at 1:56 PM Rodrigo Siqueira
<Rodrigo.Siqueira@xxxxxxx> wrote:
>
> When we use the allmodconfig option we see the following error:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c: In function 'dml32_ModeSupportAndSystemConfigurationFull':
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn32/display_mode_vba_32.c:3799:1: error: the frame size of 2464 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
> 3799 | } // ModeSupportAndSystemConfigurationFull
>
> This commit fixes this issue by moving part of the mode support
> operation from ModeSupportAndSystemConfigurationFull to a dedicated
> function.
>
> Cc: Harry Wentland <harry.wentland@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@xxxxxxx>
Thanks for sorting this out!
Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> .../dc/dml/dcn32/display_mode_vba_32.c | 132 ++++++++++--------
> 1 file changed, 70 insertions(+), 62 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> index 573504de1789..465fd240b8fb 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> @@ -1654,6 +1654,75 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
> #endif
> }
>
> +static void mode_support_configuration(struct vba_vars_st *v,
> + struct display_mode_lib *mode_lib)
> +{
> + int i, j;
> +
> + for (i = v->soc.num_states - 1; i >= 0; i--) {
> + for (j = 0; j < 2; j++) {
> + if (mode_lib->vba.ScaleRatioAndTapsSupport == true
> + && mode_lib->vba.SourceFormatPixelAndScanSupport == true
> + && mode_lib->vba.ViewportSizeSupport[i][j] == true
> + && !mode_lib->vba.LinkRateDoesNotMatchDPVersion
> + && !mode_lib->vba.LinkRateForMultistreamNotIndicated
> + && !mode_lib->vba.BPPForMultistreamNotIndicated
> + && !mode_lib->vba.MultistreamWithHDMIOreDP
> + && !mode_lib->vba.ExceededMultistreamSlots[i]
> + && !mode_lib->vba.MSOOrODMSplitWithNonDPLink
> + && !mode_lib->vba.NotEnoughLanesForMSO
> + && mode_lib->vba.LinkCapacitySupport[i] == true && !mode_lib->vba.P2IWith420
> + && !mode_lib->vba.DSCOnlyIfNecessaryWithBPP
> + && !mode_lib->vba.DSC422NativeNotSupported
> + && !mode_lib->vba.MPCCombineMethodIncompatible
> + && mode_lib->vba.ODMCombine2To1SupportCheckOK[i] == true
> + && mode_lib->vba.ODMCombine4To1SupportCheckOK[i] == true
> + && mode_lib->vba.NotEnoughDSCUnits[i] == false
> + && !mode_lib->vba.NotEnoughDSCSlices[i]
> + && !mode_lib->vba.ImmediateFlipOrHostVMAndPStateWithMALLFullFrameOrPhantomPipe
> + && !mode_lib->vba.InvalidCombinationOfMALLUseForPStateAndStaticScreen
> + && mode_lib->vba.DSCCLKRequiredMoreThanSupported[i] == false
> + && mode_lib->vba.PixelsPerLinePerDSCUnitSupport[i]
> + && mode_lib->vba.DTBCLKRequiredMoreThanSupported[i] == false
> + && !mode_lib->vba.InvalidCombinationOfMALLUseForPState
> + && !mode_lib->vba.ImmediateFlipRequiredButTheRequirementForEachSurfaceIsNotSpecified
> + && mode_lib->vba.ROBSupport[i][j] == true
> + && mode_lib->vba.DISPCLK_DPPCLK_Support[i][j] == true
> + && mode_lib->vba.TotalAvailablePipesSupport[i][j] == true
> + && mode_lib->vba.NumberOfOTGSupport == true
> + && mode_lib->vba.NumberOfHDMIFRLSupport == true
> + && mode_lib->vba.EnoughWritebackUnits == true
> + && mode_lib->vba.WritebackLatencySupport == true
> + && mode_lib->vba.WritebackScaleRatioAndTapsSupport == true
> + && mode_lib->vba.CursorSupport == true && mode_lib->vba.PitchSupport == true
> + && mode_lib->vba.ViewportExceedsSurface == false
> + && mode_lib->vba.PrefetchSupported[i][j] == true
> + && mode_lib->vba.VActiveBandwithSupport[i][j] == true
> + && mode_lib->vba.DynamicMetadataSupported[i][j] == true
> + && mode_lib->vba.TotalVerticalActiveBandwidthSupport[i][j] == true
> + && mode_lib->vba.VRatioInPrefetchSupported[i][j] == true
> + && mode_lib->vba.PTEBufferSizeNotExceeded[i][j] == true
> + && mode_lib->vba.DCCMetaBufferSizeNotExceeded[i][j] == true
> + && mode_lib->vba.NonsupportedDSCInputBPC == false
> + && !mode_lib->vba.ExceededMALLSize
> + && ((mode_lib->vba.HostVMEnable == false
> + && !mode_lib->vba.ImmediateFlipRequiredFinal)
> + || mode_lib->vba.ImmediateFlipSupportedForState[i][j])
> + && (!mode_lib->vba.DRAMClockChangeRequirementFinal
> + || i == v->soc.num_states - 1
> + || mode_lib->vba.DRAMClockChangeSupport[i][j] != dm_dram_clock_change_unsupported)
> + && (!mode_lib->vba.FCLKChangeRequirementFinal || i == v->soc.num_states - 1
> + || mode_lib->vba.FCLKChangeSupport[i][j] != dm_fclock_change_unsupported)
> + && (!mode_lib->vba.USRRetrainingRequiredFinal
> + || &mode_lib->vba.USRRetrainingSupport[i][j])) {
> + mode_lib->vba.ModeSupport[i][j] = true;
> + } else {
> + mode_lib->vba.ModeSupport[i][j] = false;
> + }
> + }
> + }
> +}
> +
> void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
> {
> struct vba_vars_st *v = &mode_lib->vba;
> @@ -3632,68 +3701,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
> }
>
> /*Mode Support, Voltage State and SOC Configuration*/
> - for (i = v->soc.num_states - 1; i >= 0; i--) {
> - for (j = 0; j < 2; j++) {
> - if (mode_lib->vba.ScaleRatioAndTapsSupport == true
> - && mode_lib->vba.SourceFormatPixelAndScanSupport == true
> - && mode_lib->vba.ViewportSizeSupport[i][j] == true
> - && !mode_lib->vba.LinkRateDoesNotMatchDPVersion
> - && !mode_lib->vba.LinkRateForMultistreamNotIndicated
> - && !mode_lib->vba.BPPForMultistreamNotIndicated
> - && !mode_lib->vba.MultistreamWithHDMIOreDP
> - && !mode_lib->vba.ExceededMultistreamSlots[i]
> - && !mode_lib->vba.MSOOrODMSplitWithNonDPLink
> - && !mode_lib->vba.NotEnoughLanesForMSO
> - && mode_lib->vba.LinkCapacitySupport[i] == true && !mode_lib->vba.P2IWith420
> - && !mode_lib->vba.DSCOnlyIfNecessaryWithBPP
> - && !mode_lib->vba.DSC422NativeNotSupported
> - && !mode_lib->vba.MPCCombineMethodIncompatible
> - && mode_lib->vba.ODMCombine2To1SupportCheckOK[i] == true
> - && mode_lib->vba.ODMCombine4To1SupportCheckOK[i] == true
> - && mode_lib->vba.NotEnoughDSCUnits[i] == false
> - && !mode_lib->vba.NotEnoughDSCSlices[i]
> - && !mode_lib->vba.ImmediateFlipOrHostVMAndPStateWithMALLFullFrameOrPhantomPipe
> - && !mode_lib->vba.InvalidCombinationOfMALLUseForPStateAndStaticScreen
> - && mode_lib->vba.DSCCLKRequiredMoreThanSupported[i] == false
> - && mode_lib->vba.PixelsPerLinePerDSCUnitSupport[i]
> - && mode_lib->vba.DTBCLKRequiredMoreThanSupported[i] == false
> - && !mode_lib->vba.InvalidCombinationOfMALLUseForPState
> - && !mode_lib->vba.ImmediateFlipRequiredButTheRequirementForEachSurfaceIsNotSpecified
> - && mode_lib->vba.ROBSupport[i][j] == true
> - && mode_lib->vba.DISPCLK_DPPCLK_Support[i][j] == true
> - && mode_lib->vba.TotalAvailablePipesSupport[i][j] == true
> - && mode_lib->vba.NumberOfOTGSupport == true
> - && mode_lib->vba.NumberOfHDMIFRLSupport == true
> - && mode_lib->vba.EnoughWritebackUnits == true
> - && mode_lib->vba.WritebackLatencySupport == true
> - && mode_lib->vba.WritebackScaleRatioAndTapsSupport == true
> - && mode_lib->vba.CursorSupport == true && mode_lib->vba.PitchSupport == true
> - && mode_lib->vba.ViewportExceedsSurface == false
> - && mode_lib->vba.PrefetchSupported[i][j] == true
> - && mode_lib->vba.VActiveBandwithSupport[i][j] == true
> - && mode_lib->vba.DynamicMetadataSupported[i][j] == true
> - && mode_lib->vba.TotalVerticalActiveBandwidthSupport[i][j] == true
> - && mode_lib->vba.VRatioInPrefetchSupported[i][j] == true
> - && mode_lib->vba.PTEBufferSizeNotExceeded[i][j] == true
> - && mode_lib->vba.DCCMetaBufferSizeNotExceeded[i][j] == true
> - && mode_lib->vba.NonsupportedDSCInputBPC == false
> - && !mode_lib->vba.ExceededMALLSize
> - && ((mode_lib->vba.HostVMEnable == false
> - && !mode_lib->vba.ImmediateFlipRequiredFinal)
> - || mode_lib->vba.ImmediateFlipSupportedForState[i][j])
> - && (!mode_lib->vba.DRAMClockChangeRequirementFinal
> - || i == v->soc.num_states - 1
> - || mode_lib->vba.DRAMClockChangeSupport[i][j] != dm_dram_clock_change_unsupported)
> - && (!mode_lib->vba.FCLKChangeRequirementFinal || i == v->soc.num_states - 1
> - || mode_lib->vba.FCLKChangeSupport[i][j] != dm_fclock_change_unsupported)
> - && (!mode_lib->vba.USRRetrainingRequiredFinal
> - || &mode_lib->vba.USRRetrainingSupport[i][j])) {
> - mode_lib->vba.ModeSupport[i][j] = true;
> - } else {
> - mode_lib->vba.ModeSupport[i][j] = false;
> - }
> - }
> - }
> + mode_support_configuration(v, mode_lib);
>
> MaximumMPCCombine = 0;
>
> --
> 2.35.1
>
