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 6df0d6edfdd11503d23a7580114f6d9834296393..c9bd1cf569a5f9d4861a3b9c1a90e783d09ca22f 100644 (file)
--- 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);