aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch')
-rw-r--r--common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch b/common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch
new file mode 100644
index 00000000..9957fc28
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0156-drm-amd-powerplay-Reload-and-initialize-the-smc-firm.patch
@@ -0,0 +1,58 @@
+From b4d418567a702f0b0eaee9a9fe1cc4d232eb020a Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Tue, 29 Dec 2015 10:25:19 +0800
+Subject: [PATCH 0156/1110] drm/amd/powerplay: Reload and initialize the smc
+ firmware on powerplay resume.
+
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+index 2764bd3..8f5d5ed 100644
+--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
++++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+@@ -203,13 +203,29 @@ static int pp_resume(void *handle)
+ struct pp_instance *pp_handle;
+ struct pp_eventmgr *eventmgr;
+ struct pem_event_data event_data = { {0} };
++ struct pp_smumgr *smumgr;
++ int ret;
+
+ if (handle == NULL)
+ return -EINVAL;
+
+ pp_handle = (struct pp_instance *)handle;
++ smumgr = pp_handle->smu_mgr;
++
++ if (smumgr == NULL || smumgr->smumgr_funcs == NULL ||
++ smumgr->smumgr_funcs->start_smu == NULL)
++ return -EINVAL;
++
++ ret = smumgr->smumgr_funcs->start_smu(smumgr);
++ if (ret) {
++ printk(KERN_ERR "[ powerplay ] smc start failed\n");
++ smumgr->smumgr_funcs->smu_fini(smumgr);
++ return ret;
++ }
++
+ eventmgr = pp_handle->eventmgr;
+ pem_handle_event(eventmgr, AMD_PP_EVENT_RESUME, &event_data);
++
+ return 0;
+ }
+
+@@ -624,6 +640,7 @@ int amd_powerplay_display_configuration_change(void *handle, const void *input)
+ hwmgr = ((struct pp_instance *)handle)->hwmgr;
+
+ phm_store_dal_configuration_data(hwmgr, display_config);
++
+ return 0;
+ }
+
+--
+2.7.4
+