aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-07-07 05:56:59 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-07-14 11:06:30 -0400
commit6f02a69648f14024213ab65cd4a4a701e40e46ff (patch)
treeaad624558954a5dc6344619b42e68acdca82e8f1 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parented21c047e9753ed5c7abe437ec25222b7d538a89 (diff)
drm/amdgpu: consistent name all GART related parts
Rename symbols from gtt_ to gart_ as appropriate. 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.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c635abdac96f..84ff824ea260 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -681,7 +681,7 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64
681} 681}
682 682
683/** 683/**
684 * amdgpu_gtt_location - try to find GTT location 684 * amdgpu_gart_location - try to find GTT location
685 * @adev: amdgpu device structure holding all necessary informations 685 * @adev: amdgpu device structure holding all necessary informations
686 * @mc: memory controller structure holding memory informations 686 * @mc: memory controller structure holding memory informations
687 * 687 *
@@ -692,28 +692,28 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64
692 * 692 *
693 * FIXME: when reducing GTT size align new size on power of 2. 693 * FIXME: when reducing GTT size align new size on power of 2.
694 */ 694 */
695void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) 695void amdgpu_gart_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; 699 size_af = adev->mc.mc_mask - mc->vram_end;
700 size_bf = mc->vram_start; 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->gart_size > size_bf) {
703 dev_warn(adev->dev, "limiting GTT\n"); 703 dev_warn(adev->dev, "limiting GTT\n");
704 mc->gtt_size = size_bf; 704 mc->gart_size = size_bf;
705 } 705 }
706 mc->gtt_start = 0; 706 mc->gart_start = 0;
707 } else { 707 } else {
708 if (mc->gtt_size > size_af) { 708 if (mc->gart_size > size_af) {
709 dev_warn(adev->dev, "limiting GTT\n"); 709 dev_warn(adev->dev, "limiting GTT\n");
710 mc->gtt_size = size_af; 710 mc->gart_size = size_af;
711 } 711 }
712 mc->gtt_start = mc->vram_end + 1; 712 mc->gart_start = mc->vram_end + 1;
713 } 713 }
714 mc->gtt_end = mc->gtt_start + mc->gtt_size - 1; 714 mc->gart_end = mc->gart_start + mc->gart_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",
716 mc->gtt_size >> 20, mc->gtt_start, mc->gtt_end); 716 mc->gart_size >> 20, mc->gart_start, mc->gart_end);
717} 717}
718 718
719/* 719/*
@@ -2031,7 +2031,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
2031 adev->flags = flags; 2031 adev->flags = flags;
2032 adev->asic_type = flags & AMD_ASIC_MASK; 2032 adev->asic_type = flags & AMD_ASIC_MASK;
2033 adev->usec_timeout = AMDGPU_MAX_USEC_TIMEOUT; 2033 adev->usec_timeout = AMDGPU_MAX_USEC_TIMEOUT;
2034 adev->mc.gtt_size = 512 * 1024 * 1024; 2034 adev->mc.gart_size = 512 * 1024 * 1024;
2035 adev->accel_working = false; 2035 adev->accel_working = false;
2036 adev->num_rings = 0; 2036 adev->num_rings = 0;
2037 adev->mman.buffer_funcs = NULL; 2037 adev->mman.buffer_funcs = NULL;