The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <sta...@vger.kernel.org>.
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
>From 2254ab45dab22a18fdd29fe0e471706872c00093 Mon Sep 17 00:00:00 2001
From: Ovidiu Bunea <ovidiu.bu...@amd.com>
Date: Mon, 18 Dec 2023 21:40:45 -0500
Subject: [PATCH] drm/amd/display: Fix DML2 watermark calculation
[Why]
core_mode_programming in DML2 should output watermark calculations
to locals, but it incorrectly uses mode_lib
[How]
update code to match HW DML2
Cc: Mario Limonciello <mario.limoncie...@amd.com>
Cc: Alex Deucher <alexander.deuc...@amd.com>
Cc: sta...@vger.kernel.org
Reviewed-by: Charlene Liu <charlene....@amd.com>
Acked-by: Alex Hung <alex.h...@amd.com>
Signed-off-by: Ovidiu Bunea <ovidiu.bu...@amd.com>
Tested-by: Daniel Wheeler <daniel.whee...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
.../drm/amd/display/dc/dml2/display_mode_core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
index a6b938a12de13..9be5ebf3a8c0b 100644
--- a/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c
@@ -9446,13 +9446,13 @@ void dml_core_mode_programming(struct
display_mode_lib_st *mode_lib, const struc
CalculateWatermarks_params->CompressedBufferSizeInkByte =
locals->CompressedBufferSizeInkByte;
// Output
- CalculateWatermarks_params->Watermark = &s->dummy_watermark; //
Watermarks *Watermark
- CalculateWatermarks_params->DRAMClockChangeSupport =
&mode_lib->ms.support.DRAMClockChangeSupport[0];
-
CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported =
&s->dummy_single_array[0][0]; // dml_float_t
*MaxActiveDRAMClockChangeLatencySupported[]
- CalculateWatermarks_params->SubViewportLinesNeededInMALL =
&mode_lib->ms.SubViewportLinesNeededInMALL[j]; // dml_uint_t
SubViewportLinesNeededInMALL[]
- CalculateWatermarks_params->FCLKChangeSupport =
&mode_lib->ms.support.FCLKChangeSupport[0];
- CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported
= &s->dummy_single[0]; // dml_float_t *MaxActiveFCLKChangeLatencySupported
- CalculateWatermarks_params->USRRetrainingSupport =
&mode_lib->ms.support.USRRetrainingSupport[0];
+ CalculateWatermarks_params->Watermark = &locals->Watermark; //
Watermarks *Watermark
+ CalculateWatermarks_params->DRAMClockChangeSupport =
&locals->DRAMClockChangeSupport;
+
CalculateWatermarks_params->MaxActiveDRAMClockChangeLatencySupported =
locals->MaxActiveDRAMClockChangeLatencySupported; // dml_float_t
*MaxActiveDRAMClockChangeLatencySupported[]
+ CalculateWatermarks_params->SubViewportLinesNeededInMALL =
locals->SubViewportLinesNeededInMALL; // dml_uint_t
SubViewportLinesNeededInMALL[]
+ CalculateWatermarks_params->FCLKChangeSupport =
&locals->FCLKChangeSupport;
+ CalculateWatermarks_params->MaxActiveFCLKChangeLatencySupported
= &locals->MaxActiveFCLKChangeLatencySupported; // dml_float_t
*MaxActiveFCLKChangeLatencySupported
+ CalculateWatermarks_params->USRRetrainingSupport =
&locals->USRRetrainingSupport;
CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport(
&mode_lib->scratch,
--
2.43.0
