Merge tag 'amd-drm-next-5.15-2021-07-29' of https://gitlab.freedesktop.org/agd5f...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / display / dc / dml / dcn31 / display_mode_vba_31.c

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
index a9667068c6901f960c45f80acbdaca322d65f65a..ce55c9caf9a270159e79caa49e5fe416642e934a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
@@ -3036,10 +3036,9 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
                }
 
                v->PrefetchAndImmediateFlipSupported =
-                               (v->PrefetchModeSupported == true
-                                               && ((!v->ImmediateFlipSupport && !v->HostVMEnable
-                                                               && v->ImmediateFlipRequirement != dm_immediate_flip_required) || v->ImmediateFlipSupported)) ?
-                                               true : false;
+                               (v->PrefetchModeSupported == true && ((!v->ImmediateFlipSupport && !v->HostVMEnable
+                               && v->ImmediateFlipRequirement[0] != dm_immediate_flip_required) ||
+                               v->ImmediateFlipSupported)) ? true : false;
 #ifdef __DML_VBA_DEBUG__
                dml_print("DML::%s: PrefetchModeSupported %d\n", __func__, v->PrefetchModeSupported);
                dml_print("DML::%s: ImmediateFlipRequirement %d\n", __func__, v->ImmediateFlipRequirement == dm_immediate_flip_required);
@@ -5103,7 +5102,7 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                v->HostVMMinPageSize,
                                v->HostVMMaxNonCachedPageTableLevels,
                                v->DynamicMetadataVMEnabled,
-                               v->ImmediateFlipRequirement,
+                               v->ImmediateFlipRequirement[0],
                                v->ProgressiveToInterlaceUnitInOPP,
                                v->MaxAveragePercentOfIdealFabricAndSDPPortBWDisplayCanUseInNormalSystemOperation,
                                v->PercentOfIdealFabricAndSDPPortBWReceivedAfterUrgLatency,
@@ -5542,7 +5541,8 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                }
                                v->NextPrefetchMode = v->NextPrefetchMode + 1;
                        } while (!((v->PrefetchSupported[i][j] == true && v->DynamicMetadataSupported[i][j] == true && v->VRatioInPrefetchSupported[i][j] == true
-                                       && ((v->HostVMEnable == false && v->ImmediateFlipRequirement != dm_immediate_flip_required)
+                                       && ((v->HostVMEnable == false &&
+                                                       v->ImmediateFlipRequirement[0] != dm_immediate_flip_required)
                                                        || v->ImmediateFlipSupportedForState[i][j] == true))
                                        || (v->NextMaxVStartup == v->MaxMaxVStartup[i][j] && NextPrefetchModeState > MaxPrefetchMode)));
 
@@ -5702,7 +5702,8 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                        && v->PrefetchSupported[i][j] == true && v->DynamicMetadataSupported[i][j] == true
                                        && v->TotalVerticalActiveBandwidthSupport[i][j] == true && v->VRatioInPrefetchSupported[i][j] == true
                                        && v->PTEBufferSizeNotExceeded[i][j] == true && v->NonsupportedDSCInputBPC == false
-                                       && ((v->HostVMEnable == false && v->ImmediateFlipRequirement != dm_immediate_flip_required)
+                                       && ((v->HostVMEnable == false
+                                       && v->ImmediateFlipRequirement[0] != dm_immediate_flip_required)
                                                        || v->ImmediateFlipSupportedForState[i][j] == true)
                                        && FMTBufferExceeded == false) {
                                v->ModeSupport[i][j] = true;