From f80c738c614e4410c3c343141c0edabfea421862 Mon Sep 17 00:00:00 2001 From: Tom St Denis Date: Tue, 6 Sep 2016 11:56:42 -0400 Subject: 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 Reviewed-by: Edward O'Callaghan Reviewed-by: Huang Rui Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/drm/amd/amdgpu/si_dpm.c') 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); } -- cgit v1.2.3-70-g09d2