1 files changed, 38 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1864-drm-amd-powerplay-refine-phm_register_thermal_interr.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1864-drm-amd-powerplay-refine-phm_register_thermal_interr.patch
new file mode 100644
index 00000000..a6312499
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1864-drm-amd-powerplay-refine-phm_register_thermal_interr.patch
@@ -0,0 +1,38 @@
+From 5fb0dacd163329105981b3d37be3e712661f9365 Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Thu, 21 Sep 2017 10:34:48 +0800
+Subject: [PATCH 1864/4131] drm/amd/powerplay: refine
+ phm_register_thermal_interrupt interface
+
+currently, not all asics implement this callback function
+so not return error to avoid powerplay initialize failed
+in those asices
+
+Change-Id: I2159b6c8fdd7f027eb322a0477c233eb8a8e7c7e
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+index f31d2cf..623cff9 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
+@@ -210,10 +210,10 @@ int phm_register_thermal_interrupt(struct pp_hwmgr *hwmgr, const void *info)
+ {
+ 	PHM_FUNC_CHECK(hwmgr);
+ 
+-	if (hwmgr->hwmgr_func->register_internal_thermal_interrupt == NULL)
+-		return -EINVAL;
++	if (hwmgr->hwmgr_func->register_internal_thermal_interrupt != NULL)
++		return hwmgr->hwmgr_func->register_internal_thermal_interrupt(hwmgr, info);
+ 
+-	return hwmgr->hwmgr_func->register_internal_thermal_interrupt(hwmgr, info);
++	return 0;
+ }
+ 
+ /**
+-- 
+2.7.4
+