From: Xiangliang Yu <Xiangliang.Yu@amd.com>
Date: Sun, 20 Nov 2016 15:00:26 +0000 (+0800)
Subject: drm/amd/powerplay: fix firmware loading failure
X-Git-Tag: v4.10-rc1~154^2~7^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7047391fababb8e3302aa3886fe93ff7bcd61d70;p=platform%2Fkernel%2Flinux-exynos.git

drm/amd/powerplay: fix firmware loading failure

For virtualization, firmware loading need the firmware version info,
and will load the right firmware. So, transfer fw_version to toc.

Signed-off-by: Frank Min <Frank.Min@amd.com>
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
index 6df0d6e..c9bd1cf5 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
@@ -366,7 +366,7 @@ static int smu7_populate_single_firmware_entry(struct pp_smumgr *smumgr,
 				&info);
 
 	if (!result) {
-		entry->version = info.version;
+		entry->version = info.fw_version;
 		entry->id = (uint16_t)fw_type;
 		entry->image_addr_high = smu_upper_32_bits(info.mc_addr);
 		entry->image_addr_low = smu_lower_32_bits(info.mc_addr);