aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch
new file mode 100644
index 00000000..a2e1b4d9
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1944-drm-amd-powerplay-fix-a-logic-error-in-pp_hw_init.patch
@@ -0,0 +1,36 @@
+From 08ec1ef727b31740fac9139628927b8c926a5df5 Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Sat, 30 Sep 2017 10:20:52 +0800
+Subject: [PATCH 1944/4131] drm/amd/powerplay: fix a logic error in pp_hw_init
+
+Change-Id: I37c7182ffb3011e41d27976f99aa1ef3074b87a6
+reviewed-by: Evan Quan <evan.quan@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+index 5d498a8..21936c0 100644
+--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
++++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+@@ -163,12 +163,11 @@ static int pp_hw_init(void *handle)
+ }
+ if (ret == PP_DPM_DISABLED)
+ goto exit;
++ ret = hwmgr_hw_init(pp_handle);
++ if (ret)
++ goto exit;
+ }
+-
+- ret = hwmgr_hw_init(pp_handle);
+- if (ret)
+- goto exit;
+- return 0;
++ return ret;
+ exit:
+ pp_handle->pm_en = 0;
+ cgs_notify_dpm_enabled(hwmgr->device, false);
+--
+2.7.4
+