On Fri, Mar 23, 2018 at 10:48:37AM +0800, Rex Zhu wrote:
> Change-Id: I31bfba4c134942e8ca9f06e43de491a734c0ef6c
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
Acked-by: Huang Rui <ray.huang at amd.com>
> ---
> drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
> index 997a777..fe6854e 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
> @@ -301,19 +301,11 @@ 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 {
> + 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);
> - result = polaris10_start_smu_in_protection_mode(hwmgr);
> - }
> - }
> -
> if (result != 0)
> PP_ASSERT_WITH_CODE(0, "Failed to load SMU ucode.", return result);
>
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
