aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/si_dpm.c
diff options
context:
space:
mode:
authorTom St Denis <[email protected]>2016-09-06 15:56:42 +0000
committerAlex Deucher <[email protected]>2016-09-14 13:43:39 +0000
commitf80c738c614e4410c3c343141c0edabfea421862 (patch)
treed6fba65f976988a694a09f1ab2a7b5b69f24c673 /drivers/gpu/drm/amd/amdgpu/si_dpm.c
parentdrm/amd/amdgpu: Tidy up SI IH code (diff)
downloadkernel-f80c738c614e4410c3c343141c0edabfea421862.tar.gz
kernel-f80c738c614e4410c3c343141c0edabfea421862.zip
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 <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Huang Rui <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_dpm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/si_dpm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 8e6bbaf380d0..7b9debefd64a 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -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);
}