1 files changed, 35 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4069-drm-amd-display-add-guard-for-SMU-ver-for-48mhz-clk.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4069-drm-amd-display-add-guard-for-SMU-ver-for-48mhz-clk.patch
new file mode 100644
index 00000000..c1db7add
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4069-drm-amd-display-add-guard-for-SMU-ver-for-48mhz-clk.patch
@@ -0,0 +1,35 @@
+From 0bfcf6a853a83e4b3fb53a14dae62d7a73f83cf8 Mon Sep 17 00:00:00 2001
+From: Joseph Gravenor <joseph.gravenor@amd.com>
+Date: Mon, 16 Sep 2019 15:13:33 -0400
+Subject: [PATCH 4069/4256] drm/amd/display: add guard for SMU ver, for 48mhz
+ clk
+
+[why]
+dp_48m_refclk_driver_pwdn is persistent through S3 and S5.
+This was worked arround in SMU FW 55.21.0. Earlier FW don't have this fix
+so we will hang on reboot
+
+[how]
+add a guard for smu versions before SMU FW 55.21.0
+
+Signed-off-by: Joseph Gravenor <joseph.gravenor@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+index a2a4c7ddc856..68d38239304c 100644
+--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
++++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+@@ -649,7 +649,7 @@ void rn_clk_mgr_construct(
+ 			pp_smu->rn_funcs.set_wm_ranges(&pp_smu->rn_funcs.pp_smu, &ranges);
+ 	}
+ 
+-	if (!IS_FPGA_MAXIMUS_DC(ctx->dce_environment)) {
++	if (!IS_FPGA_MAXIMUS_DC(ctx->dce_environment) && clk_mgr->smu_ver >= 0x00371500) {
+ 		/* enable powerfeatures when displaycount goes to 0 */
+ 		rn_vbios_smu_enable_48mhz_tmdp_refclk_pwrdwn(clk_mgr, !debug->disable_48mhz_pwrdwn);
+ 	}
+-- 
+2.17.1
+