aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c22
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c12
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_test.c48
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c10
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c8
11 files changed, 72 insertions, 72 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 590798f0c245..b19557b8c683 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -556,9 +556,9 @@ struct amdgpu_mc {
556 * about vram size near mc fb location */ 556 * about vram size near mc fb location */
557 u64 mc_vram_size; 557 u64 mc_vram_size;
558 u64 visible_vram_size; 558 u64 visible_vram_size;
559 u64 gtt_size; 559 u64 gart_size;
560 u64 gtt_start; 560 u64 gart_start;
561 u64 gtt_end; 561 u64 gart_end;
562 u64 vram_start; 562 u64 vram_start;
563 u64 vram_end; 563 u64 vram_end;
564 unsigned vram_width; 564 unsigned vram_width;
@@ -1860,7 +1860,7 @@ bool amdgpu_ttm_tt_is_readonly(struct ttm_tt *ttm);
1860uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, 1860uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
1861 struct ttm_mem_reg *mem); 1861 struct ttm_mem_reg *mem);
1862void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base); 1862void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base);
1863void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc); 1863void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc);
1864void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); 1864void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size);
1865int amdgpu_ttm_init(struct amdgpu_device *adev); 1865int amdgpu_ttm_init(struct amdgpu_device *adev);
1866void amdgpu_ttm_fini(struct amdgpu_device *adev); 1866void amdgpu_ttm_fini(struct amdgpu_device *adev);
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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index b4048a91c814..d578ca6f2dfd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@ -57,11 +57,11 @@
57 */ 57 */
58 58
59/** 59/**
60 * amdgpu_gart_set_defaults - set the default gtt_size 60 * amdgpu_gart_set_defaults - set the default gart_size
61 * 61 *
62 * @adev: amdgpu_device pointer 62 * @adev: amdgpu_device pointer
63 * 63 *
64 * Set the default gtt_size based on parameters and available VRAM. 64 * Set the default gart_size based on parameters and available VRAM.
65 */ 65 */
66void amdgpu_gart_set_defaults(struct amdgpu_device *adev) 66void amdgpu_gart_set_defaults(struct amdgpu_device *adev)
67{ 67{
@@ -69,10 +69,10 @@ void amdgpu_gart_set_defaults(struct amdgpu_device *adev)
69 * size equal to the 1024 or vram, whichever is larger. 69 * size equal to the 1024 or vram, whichever is larger.
70 */ 70 */
71 if (amdgpu_gart_size == -1) 71 if (amdgpu_gart_size == -1)
72 adev->mc.gtt_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20), 72 adev->mc.gart_size = max((AMDGPU_DEFAULT_GTT_SIZE_MB << 20),
73 adev->mc.mc_vram_size); 73 adev->mc.mc_vram_size);
74 else 74 else
75 adev->mc.gtt_size = (uint64_t)amdgpu_gart_size << 20; 75 adev->mc.gart_size = (uint64_t)amdgpu_gart_size << 20;
76} 76}
77 77
78/** 78/**
@@ -387,8 +387,8 @@ int amdgpu_gart_init(struct amdgpu_device *adev)
387 if (r) 387 if (r)
388 return r; 388 return r;
389 /* Compute table size */ 389 /* Compute table size */
390 adev->gart.num_cpu_pages = adev->mc.gtt_size / PAGE_SIZE; 390 adev->gart.num_cpu_pages = adev->mc.gart_size / PAGE_SIZE;
391 adev->gart.num_gpu_pages = adev->mc.gtt_size / AMDGPU_GPU_PAGE_SIZE; 391 adev->gart.num_gpu_pages = adev->mc.gart_size / AMDGPU_GPU_PAGE_SIZE;
392 DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n", 392 DRM_INFO("GART: num cpu pages %u, num gpu pages %u\n",
393 adev->gart.num_cpu_pages, adev->gart.num_gpu_pages); 393 adev->gart.num_cpu_pages, adev->gart.num_gpu_pages);
394 394
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index d02e611a2dae..3c4d7574d704 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -33,7 +33,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
33 struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring; 33 struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring;
34 struct amdgpu_bo *vram_obj = NULL; 34 struct amdgpu_bo *vram_obj = NULL;
35 struct amdgpu_bo **gtt_obj = NULL; 35 struct amdgpu_bo **gtt_obj = NULL;
36 uint64_t gtt_addr, vram_addr; 36 uint64_t gart_addr, vram_addr;
37 unsigned n, size; 37 unsigned n, size;
38 int i, r; 38 int i, r;
39 39
@@ -42,7 +42,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
42 /* Number of tests = 42 /* Number of tests =
43 * (Total GTT - IB pool - writeback page - ring buffers) / test size 43 * (Total GTT - IB pool - writeback page - ring buffers) / test size
44 */ 44 */
45 n = adev->mc.gtt_size - AMDGPU_IB_POOL_SIZE*64*1024; 45 n = adev->mc.gart_size - AMDGPU_IB_POOL_SIZE*64*1024;
46 for (i = 0; i < AMDGPU_MAX_RINGS; ++i) 46 for (i = 0; i < AMDGPU_MAX_RINGS; ++i)
47 if (adev->rings[i]) 47 if (adev->rings[i])
48 n -= adev->rings[i]->ring_size; 48 n -= adev->rings[i]->ring_size;
@@ -76,7 +76,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
76 } 76 }
77 for (i = 0; i < n; i++) { 77 for (i = 0; i < n; i++) {
78 void *gtt_map, *vram_map; 78 void *gtt_map, *vram_map;
79 void **gtt_start, **gtt_end; 79 void **gart_start, **gart_end;
80 void **vram_start, **vram_end; 80 void **vram_start, **vram_end;
81 struct dma_fence *fence = NULL; 81 struct dma_fence *fence = NULL;
82 82
@@ -91,7 +91,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
91 r = amdgpu_bo_reserve(gtt_obj[i], false); 91 r = amdgpu_bo_reserve(gtt_obj[i], false);
92 if (unlikely(r != 0)) 92 if (unlikely(r != 0))
93 goto out_lclean_unref; 93 goto out_lclean_unref;
94 r = amdgpu_bo_pin(gtt_obj[i], AMDGPU_GEM_DOMAIN_GTT, &gtt_addr); 94 r = amdgpu_bo_pin(gtt_obj[i], AMDGPU_GEM_DOMAIN_GTT, &gart_addr);
95 if (r) { 95 if (r) {
96 DRM_ERROR("Failed to pin GTT object %d\n", i); 96 DRM_ERROR("Failed to pin GTT object %d\n", i);
97 goto out_lclean_unres; 97 goto out_lclean_unres;
@@ -103,14 +103,14 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
103 goto out_lclean_unpin; 103 goto out_lclean_unpin;
104 } 104 }
105 105
106 for (gtt_start = gtt_map, gtt_end = gtt_map + size; 106 for (gart_start = gtt_map, gart_end = gtt_map + size;
107 gtt_start < gtt_end; 107 gart_start < gart_end;
108 gtt_start++) 108 gart_start++)
109 *gtt_start = gtt_start; 109 *gart_start = gart_start;
110 110
111 amdgpu_bo_kunmap(gtt_obj[i]); 111 amdgpu_bo_kunmap(gtt_obj[i]);
112 112
113 r = amdgpu_copy_buffer(ring, gtt_addr, vram_addr, 113 r = amdgpu_copy_buffer(ring, gart_addr, vram_addr,
114 size, NULL, &fence, false, false); 114 size, NULL, &fence, false, false);
115 115
116 if (r) { 116 if (r) {
@@ -132,21 +132,21 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
132 goto out_lclean_unpin; 132 goto out_lclean_unpin;
133 } 133 }
134 134
135 for (gtt_start = gtt_map, gtt_end = gtt_map + size, 135 for (gart_start = gtt_map, gart_end = gtt_map + size,
136 vram_start = vram_map, vram_end = vram_map + size; 136 vram_start = vram_map, vram_end = vram_map + size;
137 vram_start < vram_end; 137 vram_start < vram_end;
138 gtt_start++, vram_start++) { 138 gart_start++, vram_start++) {
139 if (*vram_start != gtt_start) { 139 if (*vram_start != gart_start) {
140 DRM_ERROR("Incorrect GTT->VRAM copy %d: Got 0x%p, " 140 DRM_ERROR("Incorrect GTT->VRAM copy %d: Got 0x%p, "
141 "expected 0x%p (GTT/VRAM offset " 141 "expected 0x%p (GTT/VRAM offset "
142 "0x%16llx/0x%16llx)\n", 142 "0x%16llx/0x%16llx)\n",
143 i, *vram_start, gtt_start, 143 i, *vram_start, gart_start,
144 (unsigned long long) 144 (unsigned long long)
145 (gtt_addr - adev->mc.gtt_start + 145 (gart_addr - adev->mc.gart_start +
146 (void*)gtt_start - gtt_map), 146 (void*)gart_start - gtt_map),
147 (unsigned long long) 147 (unsigned long long)
148 (vram_addr - adev->mc.vram_start + 148 (vram_addr - adev->mc.vram_start +
149 (void*)gtt_start - gtt_map)); 149 (void*)gart_start - gtt_map));
150 amdgpu_bo_kunmap(vram_obj); 150 amdgpu_bo_kunmap(vram_obj);
151 goto out_lclean_unpin; 151 goto out_lclean_unpin;
152 } 152 }
@@ -155,7 +155,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
155 155
156 amdgpu_bo_kunmap(vram_obj); 156 amdgpu_bo_kunmap(vram_obj);
157 157
158 r = amdgpu_copy_buffer(ring, vram_addr, gtt_addr, 158 r = amdgpu_copy_buffer(ring, vram_addr, gart_addr,
159 size, NULL, &fence, false, false); 159 size, NULL, &fence, false, false);
160 160
161 if (r) { 161 if (r) {
@@ -177,20 +177,20 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
177 goto out_lclean_unpin; 177 goto out_lclean_unpin;
178 } 178 }
179 179
180 for (gtt_start = gtt_map, gtt_end = gtt_map + size, 180 for (gart_start = gtt_map, gart_end = gtt_map + size,
181 vram_start = vram_map, vram_end = vram_map + size; 181 vram_start = vram_map, vram_end = vram_map + size;
182 gtt_start < gtt_end; 182 gart_start < gart_end;
183 gtt_start++, vram_start++) { 183 gart_start++, vram_start++) {
184 if (*gtt_start != vram_start) { 184 if (*gart_start != vram_start) {
185 DRM_ERROR("Incorrect VRAM->GTT copy %d: Got 0x%p, " 185 DRM_ERROR("Incorrect VRAM->GTT copy %d: Got 0x%p, "
186 "expected 0x%p (VRAM/GTT offset " 186 "expected 0x%p (VRAM/GTT offset "
187 "0x%16llx/0x%16llx)\n", 187 "0x%16llx/0x%16llx)\n",
188 i, *gtt_start, vram_start, 188 i, *gart_start, vram_start,
189 (unsigned long long) 189 (unsigned long long)
190 (vram_addr - adev->mc.vram_start + 190 (vram_addr - adev->mc.vram_start +
191 (void*)vram_start - vram_map), 191 (void*)vram_start - vram_map),
192 (unsigned long long) 192 (unsigned long long)
193 (gtt_addr - adev->mc.gtt_start + 193 (gart_addr - adev->mc.gart_start +
194 (void*)vram_start - vram_map)); 194 (void*)vram_start - vram_map));
195 amdgpu_bo_kunmap(gtt_obj[i]); 195 amdgpu_bo_kunmap(gtt_obj[i]);
196 goto out_lclean_unpin; 196 goto out_lclean_unpin;
@@ -200,7 +200,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
200 amdgpu_bo_kunmap(gtt_obj[i]); 200 amdgpu_bo_kunmap(gtt_obj[i]);
201 201
202 DRM_INFO("Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x%llx\n", 202 DRM_INFO("Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x%llx\n",
203 gtt_addr - adev->mc.gtt_start); 203 gart_addr - adev->mc.gart_start);
204 continue; 204 continue;
205 205
206out_lclean_unpin: 206out_lclean_unpin:
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index fb9c6988f5f2..4e711d9af67c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -158,7 +158,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
158 break; 158 break;
159 case TTM_PL_TT: 159 case TTM_PL_TT:
160 man->func = &amdgpu_gtt_mgr_func; 160 man->func = &amdgpu_gtt_mgr_func;
161 man->gpu_offset = adev->mc.gtt_start; 161 man->gpu_offset = adev->mc.gart_start;
162 man->available_caching = TTM_PL_MASK_CACHING; 162 man->available_caching = TTM_PL_MASK_CACHING;
163 man->default_caching = TTM_PL_FLAG_CACHED; 163 man->default_caching = TTM_PL_FLAG_CACHED;
164 man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; 164 man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA;
@@ -1144,13 +1144,13 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
1144 DRM_INFO("amdgpu: %uM of VRAM memory ready\n", 1144 DRM_INFO("amdgpu: %uM of VRAM memory ready\n",
1145 (unsigned) (adev->mc.real_vram_size / (1024 * 1024))); 1145 (unsigned) (adev->mc.real_vram_size / (1024 * 1024)));
1146 r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT, 1146 r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT,
1147 adev->mc.gtt_size >> PAGE_SHIFT); 1147 adev->mc.gart_size >> PAGE_SHIFT);
1148 if (r) { 1148 if (r) {
1149 DRM_ERROR("Failed initializing GTT heap.\n"); 1149 DRM_ERROR("Failed initializing GTT heap.\n");
1150 return r; 1150 return r;
1151 } 1151 }
1152 DRM_INFO("amdgpu: %uM of GTT memory ready.\n", 1152 DRM_INFO("amdgpu: %uM of GTT memory ready.\n",
1153 (unsigned)(adev->mc.gtt_size / (1024 * 1024))); 1153 (unsigned)(adev->mc.gart_size / (1024 * 1024)));
1154 1154
1155 adev->gds.mem.total_size = adev->gds.mem.total_size << AMDGPU_GDS_SHIFT; 1155 adev->gds.mem.total_size = adev->gds.mem.total_size << AMDGPU_GDS_SHIFT;
1156 adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size << AMDGPU_GDS_SHIFT; 1156 adev->gds.mem.gfx_partition_size = adev->gds.mem.gfx_partition_size << AMDGPU_GDS_SHIFT;
@@ -1279,7 +1279,7 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo,
1279 BUG_ON(adev->mman.buffer_funcs->copy_max_bytes < 1279 BUG_ON(adev->mman.buffer_funcs->copy_max_bytes <
1280 AMDGPU_GTT_MAX_TRANSFER_SIZE * 8); 1280 AMDGPU_GTT_MAX_TRANSFER_SIZE * 8);
1281 1281
1282 *addr = adev->mc.gtt_start; 1282 *addr = adev->mc.gart_start;
1283 *addr += (u64)window * AMDGPU_GTT_MAX_TRANSFER_SIZE * 1283 *addr += (u64)window * AMDGPU_GTT_MAX_TRANSFER_SIZE *
1284 AMDGPU_GPU_PAGE_SIZE; 1284 AMDGPU_GPU_PAGE_SIZE;
1285 1285
@@ -1645,7 +1645,7 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
1645 adev, &amdgpu_ttm_gtt_fops); 1645 adev, &amdgpu_ttm_gtt_fops);
1646 if (IS_ERR(ent)) 1646 if (IS_ERR(ent))
1647 return PTR_ERR(ent); 1647 return PTR_ERR(ent);
1648 i_size_write(ent->d_inode, adev->mc.gtt_size); 1648 i_size_write(ent->d_inode, adev->mc.gart_size);
1649 adev->mman.gtt = ent; 1649 adev->mman.gtt = ent;
1650 1650
1651#endif 1651#endif
diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
index a42f483767e7..3ff786cfc947 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
@@ -58,14 +58,14 @@ static void gfxhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev)
58 gfxhub_v1_0_init_gart_pt_regs(adev); 58 gfxhub_v1_0_init_gart_pt_regs(adev);
59 59
60 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, 60 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32,
61 (u32)(adev->mc.gtt_start >> 12)); 61 (u32)(adev->mc.gart_start >> 12));
62 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, 62 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32,
63 (u32)(adev->mc.gtt_start >> 44)); 63 (u32)(adev->mc.gart_start >> 44));
64 64
65 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, 65 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32,
66 (u32)(adev->mc.gtt_end >> 12)); 66 (u32)(adev->mc.gart_end >> 12));
67 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, 67 WREG32_SOC15(GC, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32,
68 (u32)(adev->mc.gtt_end >> 44)); 68 (u32)(adev->mc.gart_end >> 44));
69} 69}
70 70
71static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 71static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 810d5734ce1e..886df0902067 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -228,7 +228,7 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev,
228 mc->mc_vram_size = 0xFFC0000000ULL; 228 mc->mc_vram_size = 0xFFC0000000ULL;
229 } 229 }
230 amdgpu_vram_location(adev, &adev->mc, base); 230 amdgpu_vram_location(adev, &adev->mc, base);
231 amdgpu_gtt_location(adev, mc); 231 amdgpu_gart_location(adev, mc);
232} 232}
233 233
234static void gmc_v6_0_mc_program(struct amdgpu_device *adev) 234static void gmc_v6_0_mc_program(struct amdgpu_device *adev)
@@ -481,8 +481,8 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)
481 (4UL << VM_L2_CNTL3__BANK_SELECT__SHIFT) | 481 (4UL << VM_L2_CNTL3__BANK_SELECT__SHIFT) |
482 (4UL << VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT)); 482 (4UL << VM_L2_CNTL3__L2_CACHE_BIGK_FRAGMENT_SIZE__SHIFT));
483 /* setup context0 */ 483 /* setup context0 */
484 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >> 12); 484 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >> 12);
485 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >> 12); 485 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >> 12);
486 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12); 486 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12);
487 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, 487 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
488 (u32)(adev->dummy_page.addr >> 12)); 488 (u32)(adev->dummy_page.addr >> 12));
@@ -529,7 +529,7 @@ static int gmc_v6_0_gart_enable(struct amdgpu_device *adev)
529 529
530 gmc_v6_0_gart_flush_gpu_tlb(adev, 0); 530 gmc_v6_0_gart_flush_gpu_tlb(adev, 0);
531 dev_info(adev->dev, "PCIE GART of %uM enabled (table at 0x%016llX).\n", 531 dev_info(adev->dev, "PCIE GART of %uM enabled (table at 0x%016llX).\n",
532 (unsigned)(adev->mc.gtt_size >> 20), 532 (unsigned)(adev->mc.gart_size >> 20),
533 (unsigned long long)adev->gart.table_addr); 533 (unsigned long long)adev->gart.table_addr);
534 adev->gart.ready = true; 534 adev->gart.ready = true;
535 return 0; 535 return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 066f00ad4152..21a45b403b21 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -244,7 +244,7 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev,
244 mc->mc_vram_size = 0xFFC0000000ULL; 244 mc->mc_vram_size = 0xFFC0000000ULL;
245 } 245 }
246 amdgpu_vram_location(adev, &adev->mc, base); 246 amdgpu_vram_location(adev, &adev->mc, base);
247 amdgpu_gtt_location(adev, mc); 247 amdgpu_gart_location(adev, mc);
248} 248}
249 249
250/** 250/**
@@ -584,8 +584,8 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)
584 tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3, L2_CACHE_BIGK_FRAGMENT_SIZE, 4); 584 tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3, L2_CACHE_BIGK_FRAGMENT_SIZE, 4);
585 WREG32(mmVM_L2_CNTL3, tmp); 585 WREG32(mmVM_L2_CNTL3, tmp);
586 /* setup context0 */ 586 /* setup context0 */
587 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >> 12); 587 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >> 12);
588 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >> 12); 588 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >> 12);
589 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12); 589 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12);
590 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, 590 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
591 (u32)(adev->dummy_page.addr >> 12)); 591 (u32)(adev->dummy_page.addr >> 12));
@@ -639,7 +639,7 @@ static int gmc_v7_0_gart_enable(struct amdgpu_device *adev)
639 639
640 gmc_v7_0_gart_flush_gpu_tlb(adev, 0); 640 gmc_v7_0_gart_flush_gpu_tlb(adev, 0);
641 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n", 641 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
642 (unsigned)(adev->mc.gtt_size >> 20), 642 (unsigned)(adev->mc.gart_size >> 20),
643 (unsigned long long)adev->gart.table_addr); 643 (unsigned long long)adev->gart.table_addr);
644 adev->gart.ready = true; 644 adev->gart.ready = true;
645 return 0; 645 return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index f30c39c72bca..2b39606f1d3c 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -406,7 +406,7 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev,
406 mc->mc_vram_size = 0xFFC0000000ULL; 406 mc->mc_vram_size = 0xFFC0000000ULL;
407 } 407 }
408 amdgpu_vram_location(adev, &adev->mc, base); 408 amdgpu_vram_location(adev, &adev->mc, base);
409 amdgpu_gtt_location(adev, mc); 409 amdgpu_gart_location(adev, mc);
410} 410}
411 411
412/** 412/**
@@ -786,8 +786,8 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
786 tmp = REG_SET_FIELD(tmp, VM_L2_CNTL4, VMC_TAP_CONTEXT1_PTE_REQUEST_SNOOP, 0); 786 tmp = REG_SET_FIELD(tmp, VM_L2_CNTL4, VMC_TAP_CONTEXT1_PTE_REQUEST_SNOOP, 0);
787 WREG32(mmVM_L2_CNTL4, tmp); 787 WREG32(mmVM_L2_CNTL4, tmp);
788 /* setup context0 */ 788 /* setup context0 */
789 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gtt_start >> 12); 789 WREG32(mmVM_CONTEXT0_PAGE_TABLE_START_ADDR, adev->mc.gart_start >> 12);
790 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gtt_end >> 12); 790 WREG32(mmVM_CONTEXT0_PAGE_TABLE_END_ADDR, adev->mc.gart_end >> 12);
791 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12); 791 WREG32(mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR, adev->gart.table_addr >> 12);
792 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR, 792 WREG32(mmVM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
793 (u32)(adev->dummy_page.addr >> 12)); 793 (u32)(adev->dummy_page.addr >> 12));
@@ -842,7 +842,7 @@ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
842 842
843 gmc_v8_0_gart_flush_gpu_tlb(adev, 0); 843 gmc_v8_0_gart_flush_gpu_tlb(adev, 0);
844 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n", 844 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
845 (unsigned)(adev->mc.gtt_size >> 20), 845 (unsigned)(adev->mc.gart_size >> 20),
846 (unsigned long long)adev->gart.table_addr); 846 (unsigned long long)adev->gart.table_addr);
847 adev->gart.ready = true; 847 adev->gart.ready = true;
848 return 0; 848 return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index dd2756ec11b8..677181fdfa00 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -420,7 +420,7 @@ static void gmc_v9_0_vram_gtt_location(struct amdgpu_device *adev,
420 if (!amdgpu_sriov_vf(adev)) 420 if (!amdgpu_sriov_vf(adev))
421 base = mmhub_v1_0_get_fb_location(adev); 421 base = mmhub_v1_0_get_fb_location(adev);
422 amdgpu_vram_location(adev, &adev->mc, base); 422 amdgpu_vram_location(adev, &adev->mc, base);
423 amdgpu_gtt_location(adev, mc); 423 amdgpu_gart_location(adev, mc);
424 /* base offset of vram pages */ 424 /* base offset of vram pages */
425 if (adev->flags & AMD_IS_APU) 425 if (adev->flags & AMD_IS_APU)
426 adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev); 426 adev->vm_manager.vram_base_offset = gfxhub_v1_0_get_mc_fb_offset(adev);
@@ -736,7 +736,7 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev)
736 gmc_v9_0_gart_flush_gpu_tlb(adev, 0); 736 gmc_v9_0_gart_flush_gpu_tlb(adev, 0);
737 737
738 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n", 738 DRM_INFO("PCIE GART of %uM enabled (table at 0x%016llX).\n",
739 (unsigned)(adev->mc.gtt_size >> 20), 739 (unsigned)(adev->mc.gart_size >> 20),
740 (unsigned long long)adev->gart.table_addr); 740 (unsigned long long)adev->gart.table_addr);
741 adev->gart.ready = true; 741 adev->gart.ready = true;
742 return 0; 742 return 0;
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index 9f2cf78907a3..0780e830b76b 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -69,14 +69,14 @@ static void mmhub_v1_0_init_gart_aperture_regs(struct amdgpu_device *adev)
69 mmhub_v1_0_init_gart_pt_regs(adev); 69 mmhub_v1_0_init_gart_pt_regs(adev);
70 70
71 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32, 71 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_LO32,
72 (u32)(adev->mc.gtt_start >> 12)); 72 (u32)(adev->mc.gart_start >> 12));
73 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32, 73 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_START_ADDR_HI32,
74 (u32)(adev->mc.gtt_start >> 44)); 74 (u32)(adev->mc.gart_start >> 44));
75 75
76 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32, 76 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_LO32,
77 (u32)(adev->mc.gtt_end >> 12)); 77 (u32)(adev->mc.gart_end >> 12));
78 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32, 78 WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_PAGE_TABLE_END_ADDR_HI32,
79 (u32)(adev->mc.gtt_end >> 44)); 79 (u32)(adev->mc.gart_end >> 44));
80} 80}
81 81
82static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 82static void mmhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev)