diff options
author | Christian König <christian.koenig@amd.com> | 2017-07-06 16:26:05 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-07-14 11:06:29 -0400 |
commit | ed21c047e9753ed5c7abe437ec25222b7d538a89 (patch) | |
tree | a63603a3442260b4d91a275fb87ff4c0f48b7fd0 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 3490bdb537fbf94a7a57f6c353a39e6306a9cfbd (diff) |
drm/amdgpu: remove gtt_base_align handling
Not used any more.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index d92ac5c1af54..c635abdac96f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -696,8 +696,8 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) | |||
696 | { | 696 | { |
697 | u64 size_af, size_bf; | 697 | u64 size_af, size_bf; |
698 | 698 | ||
699 | size_af = ((adev->mc.mc_mask - mc->vram_end) + mc->gtt_base_align) & ~mc->gtt_base_align; | 699 | size_af = adev->mc.mc_mask - mc->vram_end; |
700 | size_bf = mc->vram_start & ~mc->gtt_base_align; | 700 | size_bf = mc->vram_start; |
701 | if (size_bf > size_af) { | 701 | if (size_bf > size_af) { |
702 | if (mc->gtt_size > size_bf) { | 702 | if (mc->gtt_size > size_bf) { |
703 | dev_warn(adev->dev, "limiting GTT\n"); | 703 | dev_warn(adev->dev, "limiting GTT\n"); |
@@ -709,7 +709,7 @@ void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) | |||
709 | dev_warn(adev->dev, "limiting GTT\n"); | 709 | dev_warn(adev->dev, "limiting GTT\n"); |
710 | mc->gtt_size = size_af; | 710 | mc->gtt_size = size_af; |
711 | } | 711 | } |
712 | mc->gtt_start = (mc->vram_end + 1 + mc->gtt_base_align) & ~mc->gtt_base_align; | 712 | mc->gtt_start = mc->vram_end + 1; |
713 | } | 713 | } |
714 | mc->gtt_end = mc->gtt_start + mc->gtt_size - 1; | 714 | mc->gtt_end = mc->gtt_start + mc->gtt_size - 1; |
715 | dev_info(adev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n", | 715 | dev_info(adev->dev, "GTT: %lluM 0x%016llX - 0x%016llX\n", |