| From 6517d16dc2e050ed226c110489daa14716bdb1b8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 4 Mar 2021 11:04:26 -0500 |
| Subject: drm/amd/display: fix dml prefetch validation |
| |
| From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com> |
| |
| [ 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> |
| --- |
| drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c | 1 + |
| drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| 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 0f3f510fd83b..9729cf292e84 100644 |
| --- 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 |
| @@ -3437,6 +3437,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 210c96cd5b03..51098c2c9854 100644 |
| --- 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 |
| @@ -3544,6 +3544,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 |
| -- |
| 2.30.2 |
| |
