From: Rex Zhu <Rex.Zhu@amd.com>
Date: Thu, 15 Dec 2016 09:39:04 +0000 (+0800)
Subject: drm/amd/powerplay: fix issue can't load another smu firmware.
X-Git-Tag: MMI-PSA29.97-13-9~6111^2~31^2~92
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23c8ea921d286449a214732738a42f115870f44b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

drm/amd/powerplay: fix issue can't load another smu firmware.

need to release failed smu firmware before load another
firmware.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
index 8d6d9143f711..47fbc733ab55 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
@@ -328,6 +328,7 @@ static int polaris10_start_smu(struct pp_smumgr *smumgr)
 			/* If failed, try with different security Key. */
 			if (result != 0) {
 				smu_data->smu7_data.security_hard_key ^= 1;
+				cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU);
 				result = polaris10_start_smu_in_protection_mode(smumgr);
 			}
 		}