drm/amd/amdgpu: Tidy up SI SMC code (v2)

As well as merge SMC clock functions into one to reduce LOC.

v2: Fix swapped ck enable bit
bug: https://bugs.freedesktop.org/show_bug.cgi?id=97801

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis
2016-09-06 11:56:42 -04:00
committed by Alex Deucher
parent 6e9057a8f9
commit f80c738c61
3 changed files with 12 additions and 22 deletions

View File

@@ -3944,13 +3944,13 @@ static void si_dpm_start_smc(struct amdgpu_device *adev)
{
si_program_jump_on_start(adev);
si_start_smc(adev);
si_start_smc_clock(adev);
si_smc_clock(adev, true);
}
static void si_dpm_stop_smc(struct amdgpu_device *adev)
{
si_reset_smc(adev);
si_stop_smc_clock(adev);
si_smc_clock(adev, false);
}
static int si_process_firmware_header(struct amdgpu_device *adev)
@@ -4366,7 +4366,7 @@ static int si_upload_firmware(struct amdgpu_device *adev)
struct si_power_info *si_pi = si_get_pi(adev);
si_reset_smc(adev);
si_stop_smc_clock(adev);
si_smc_clock(adev, false);
return si_load_smc_ucode(adev, si_pi->sram_end);
}