drm/amd/display: fix dml prefetch validation

[ Upstream commit 8ee0fea4baf90e43efe2275de208a7809f9985bc ]

Incorrect variable used, missing initialization during validation.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Eric Bernstein <Eric.Bernstein@amd.com>
Acked-by: Solomon Chiu <solomon.chiu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
index 6c6c486b774a4ea8d043ba8cae61a4ac6a36cbd9..945d23ca36777ed45f812fa6edc761d7292f110e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
@@ -3435,6 +3435,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                        mode_lib->vba.DCCEnabledInAnyPlane = true;
                }
        }
+       mode_lib->vba.UrgentLatency = mode_lib->vba.UrgentLatencyPixelDataOnly;
        for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {
                locals->FabricAndDRAMBandwidthPerState[i] = dml_min(
                                mode_lib->vba.DRAMSpeedPerState[i] * mode_lib->vba.NumberOfChannels

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
index 0fafd693ffb41efb29d718e9ef986eef23aac253..5b5ed1be19badb3c27e9ab71e9349927da62fbeb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
@@ -3467,6 +3467,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode
                        mode_lib->vba.DCCEnabledInAnyPlane = true;
                }
        }
+       mode_lib->vba.UrgentLatency = mode_lib->vba.UrgentLatencyPixelDataOnly;
        for (i = 0; i <= mode_lib->vba.soc.num_states; i++) {
                locals->FabricAndDRAMBandwidthPerState[i] = dml_min(
                                mode_lib->vba.DRAMSpeedPerState[i] * mode_lib->vba.NumberOfChannels