From: jsg <jsg@openbsd.org>
Date: Tue, 13 Jun 2023 03:23:52 +0000 (+0000)
Subject: drm/amd/display: Enforce 60us prefetch for 200Mhz DCFCLK modes
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8bc790bb015b65ada84e59433fe8806f3e44f780;p=openbsd

drm/amd/display: Enforce 60us prefetch for 200Mhz DCFCLK modes

From Alvin Lee
348dcdf102a44ab5b389c4cd932bc1a61e210f6d in linux-6.1.y/6.1.29
b504f99ccaa64da364443431e388ecf30b604e38 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
index 820042f6aac..e02e9d4b04a 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
+++ b/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
@@ -807,7 +807,8 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
 					v->SwathHeightY[k],
 					v->SwathHeightC[k],
 					TWait,
-					v->DRAMSpeedPerState[mode_lib->vba.VoltageLevel] <= MEM_STROBE_FREQ_MHZ ?
+					(v->DRAMSpeedPerState[mode_lib->vba.VoltageLevel] <= MEM_STROBE_FREQ_MHZ ||
+						v->DCFCLKPerState[mode_lib->vba.VoltageLevel] <= MIN_DCFCLK_FREQ_MHZ) ?
 							mode_lib->vba.ip.min_prefetch_in_strobe_us : 0,
 					/* Output */
 					&v->DSTXAfterScaler[k],
@@ -3288,7 +3289,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
 							v->swath_width_chroma_ub_this_state[k],
 							v->SwathHeightYThisState[k],
 							v->SwathHeightCThisState[k], v->TWait,
-							v->DRAMSpeedPerState[i] <= MEM_STROBE_FREQ_MHZ ?
+							(v->DRAMSpeedPerState[i] <= MEM_STROBE_FREQ_MHZ || v->DCFCLKState[i][j] <= MIN_DCFCLK_FREQ_MHZ) ?
 									mode_lib->vba.ip.min_prefetch_in_strobe_us : 0,
 
 							/* Output */
diff --git a/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h b/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
index c8b28c83ddf..e92eee2c664 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
+++ b/sys/dev/pci/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h
@@ -52,6 +52,7 @@
 #define BPP_BLENDED_PIPE 0xffffffff
 
 #define MEM_STROBE_FREQ_MHZ 1600
+#define MIN_DCFCLK_FREQ_MHZ 200
 #define MEM_STROBE_MAX_DELIVERY_TIME_US 60.0
 
 struct display_mode_lib;