aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
diff options
context:
space:
mode:
authorJammy Zhou <Jammy.Zhou@amd.com>2015-07-21 23:29:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:21 -0400
commit2f7d10b393c83acd3eedc3d6ab94dce29ac6a890 (patch)
treedc13e4604dc31f280f0593123e29450460969fa5 /drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
parentfa9f1d4e86f67a4df03e153d9b9cd1bd1838767c (diff)
drm/amdgpu: merge amdgpu_family.h into amd_shared.h (v2)
Make the definitions common for all driver components v2: fix kfd Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
index 6a588371d54a..77f1d7c6ea3a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
@@ -897,7 +897,7 @@ bool amdgpu_atombios_get_asic_ss_info(struct amdgpu_device *adev,
897 if ((id == ASIC_INTERNAL_ENGINE_SS) || 897 if ((id == ASIC_INTERNAL_ENGINE_SS) ||
898 (id == ASIC_INTERNAL_MEMORY_SS)) 898 (id == ASIC_INTERNAL_MEMORY_SS))
899 ss->rate /= 100; 899 ss->rate /= 100;
900 if (adev->flags & AMDGPU_IS_APU) 900 if (adev->flags & AMD_IS_APU)
901 amdgpu_atombios_get_igp_ss_overrides(adev, ss, id); 901 amdgpu_atombios_get_igp_ss_overrides(adev, ss, id);
902 return true; 902 return true;
903 } 903 }
@@ -1058,7 +1058,7 @@ void amdgpu_atombios_set_memory_clock(struct amdgpu_device *adev,
1058 SET_MEMORY_CLOCK_PS_ALLOCATION args; 1058 SET_MEMORY_CLOCK_PS_ALLOCATION args;
1059 int index = GetIndexIntoMasterTable(COMMAND, SetMemoryClock); 1059 int index = GetIndexIntoMasterTable(COMMAND, SetMemoryClock);
1060 1060
1061 if (adev->flags & AMDGPU_IS_APU) 1061 if (adev->flags & AMD_IS_APU)
1062 return; 1062 return;
1063 1063
1064 args.ulTargetMemoryClock = cpu_to_le32(mem_clock); /* 10 khz */ 1064 args.ulTargetMemoryClock = cpu_to_le32(mem_clock); /* 10 khz */