Commit 844de65e authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Remove useless fw load error handler on Polaris 



Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 44d09c6a

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c

+2 −10
Original line number Diff line number Diff line
@@ -301,18 +301,10 @@ static int polaris10_start_smu(struct pp_hwmgr *hwmgr) 
		smu_data->smu7_data.security_hard_key = (uint8_t) (PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, SMU_FIRMWARE, SMU_SEL));



		/* Check if SMU is running in protected mode */

		if (smu_data->protected_mode == 0) {

		if (smu_data->protected_mode == 0)

			result = polaris10_start_smu_in_non_protection_mode(hwmgr);

		} else {

			result = polaris10_start_smu_in_protection_mode(hwmgr);



			/* If failed, try with different security Key. */

			if (result != 0) {

				smu_data->smu7_data.security_hard_key ^= 1;

				cgs_rel_firmware(hwmgr->device, CGS_UCODE_ID_SMU);

		else

			result = polaris10_start_smu_in_protection_mode(hwmgr);

			}

		}



		if (result != 0)

			PP_ASSERT_WITH_CODE(0, "Failed to load SMU ucode.", return result);