1 files changed, 45 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1496-drm-amd-powerplay-move-setting-allowed-mask-and-feat.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1496-drm-amd-powerplay-move-setting-allowed-mask-and-feat.patch
new file mode 100644
index 00000000..95ac19ed
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1496-drm-amd-powerplay-move-setting-allowed-mask-and-feat.patch
@@ -0,0 +1,45 @@
+From 5446d0d62c27bf9d0b0c6dc7821c63b59b64c931 Mon Sep 17 00:00:00 2001
+From: Huang Rui <ray.huang@amd.com>
+Date: Wed, 20 Feb 2019 19:58:11 +0800
+Subject: [PATCH 1496/2940] drm/amd/powerplay: move setting allowed mask and
+ feature enabling together
+
+This patch moves setting allowed mask and feature enabling together to refine
+the programming sequence.
+
+Signed-off-by: Huang Rui <ray.huang@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+index 7857ceb7403f..fa6248d8adf9 100644
+--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+@@ -586,10 +586,6 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
+ 	if (ret)
+ 		return ret;
+ 
+-	ret = smu_feature_set_allowed_mask(smu);
+-	if (ret)
+-		return ret;
+-
+ 	if (initialize) {
+ 		ret = smu_read_pptable_from_vbios(smu);
+ 		if (ret)
+@@ -654,6 +650,10 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
+ 	if (ret)
+ 		return ret;
+ 
++	ret = smu_feature_set_allowed_mask(smu);
++	if (ret)
++		return ret;
++
+ 	ret = smu_system_features_control(smu, true);
+ 	if (ret)
+ 		return ret;
+-- 
+2.17.1
+