aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch
new file mode 100644
index 00000000..52d439e8
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2993-drm-amd-pp-Save-smu7-fw-version-in-Powerplay.patch
@@ -0,0 +1,55 @@
+From d0b47d0781b836c755da22cccdfb209857609ecf Mon Sep 17 00:00:00 2001
+From: Rex Zhu <Rex.Zhu@amd.com>
+Date: Tue, 19 Dec 2017 14:07:09 +0800
+Subject: [PATCH 2993/4131] drm/amd/pp: Save smu7 fw version in Powerplay
+
+Change-Id: I76a8ffc43f70fbd8c5063bdfba1e5bfd4160b896
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 1 +
+ drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+index c6c741a..0b4a556 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
+@@ -2316,6 +2316,7 @@ static int ci_load_smc_ucode(struct pp_hwmgr *hwmgr)
+ cgs_get_firmware_info(hwmgr->device, CGS_UCODE_ID_SMU, &info);
+
+ hwmgr->is_kicker = info.is_kicker;
++ hwmgr->smu_version = info.version;
+ byte_count = info.image_size;
+ src = (uint8_t *)info.kptr;
+ start_addr = info.ucode_start_address;
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+index d75bb99..1253126 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+@@ -204,7 +204,7 @@ static int iceland_smu_upload_firmware_image(struct pp_hwmgr *hwmgr)
+ pr_err("[ powerplay ] SMC address is beyond the SMC RAM area\n");
+ return -EINVAL;
+ }
+-
++ hwmgr->smu_version = info.version;
+ /* wait for smc boot up */
+ PHM_WAIT_INDIRECT_FIELD_UNEQUAL(hwmgr, SMC_IND,
+ RCU_UC_EVENTS, boot_seq_done, 0);
+diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+index 7f5359a..cb95e88 100644
+--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+@@ -535,7 +535,7 @@ int smu7_upload_smu_firmware_image(struct pp_hwmgr *hwmgr)
+ smu7_convert_fw_type_to_cgs(UCODE_ID_SMU_SK), &info);
+
+ hwmgr->is_kicker = info.is_kicker;
+-
++ hwmgr->smu_version = info.version;
+ result = smu7_upload_smc_firmware_data(hwmgr, info.image_size, (uint32_t *)info.kptr, SMU7_SMC_SIZE);
+
+ return result;
+--
+2.7.4
+