1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index ed8c3739015b..2dbe87591f81 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -42,7 +42,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
         /* Number of tests =
          * (Total GTT - IB pool - writeback page - ring buffers) / test size
          */
-        n = adev->mc.gart_size - AMDGPU_IB_POOL_SIZE*64*1024;
+        n = adev->gmc.gart_size - AMDGPU_IB_POOL_SIZE*64*1024;
         for (i = 0; i < AMDGPU_MAX_RINGS; ++i)
                 if (adev->rings[i])
                         n -= adev->rings[i]->ring_size;
@@ -59,9 +59,8 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                 goto out_cleanup;
         }
 
-        r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
-                             AMDGPU_GEM_DOMAIN_VRAM, 0,
-                             NULL, NULL, 0, &vram_obj);
+        r = amdgpu_bo_create(adev, size, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, 0,
+                             ttm_bo_type_kernel, NULL, &vram_obj);
         if (r) {
                 DRM_ERROR("Failed to create VRAM object\n");
                 goto out_cleanup;
@@ -80,9 +79,9 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                 void **vram_start, **vram_end;
                 struct dma_fence *fence = NULL;
 
-                r = amdgpu_bo_create(adev, size, PAGE_SIZE, true,
-                                     AMDGPU_GEM_DOMAIN_GTT, 0, NULL,
-                                     NULL, 0, gtt_obj + i);
+                r = amdgpu_bo_create(adev, size, PAGE_SIZE,
+                                     AMDGPU_GEM_DOMAIN_GTT, 0,
+                                     ttm_bo_type_kernel, NULL, gtt_obj + i);
                 if (r) {
                         DRM_ERROR("Failed to create GTT object %d\n", i);
                         goto out_lclean;
@@ -142,10 +141,10 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                                           "0x%16llx/0x%16llx)\n",
                                           i, *vram_start, gart_start,
                                           (unsigned long long)
-                                          (gart_addr - adev->mc.gart_start +
+                                          (gart_addr - adev->gmc.gart_start +
                                            (void*)gart_start - gtt_map),
                                           (unsigned long long)
-                                          (vram_addr - adev->mc.vram_start +
+                                          (vram_addr - adev->gmc.vram_start +
                                            (void*)gart_start - gtt_map));
                                 amdgpu_bo_kunmap(vram_obj);
                                 goto out_lclean_unpin;
@@ -187,10 +186,10 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                                           "0x%16llx/0x%16llx)\n",
                                           i, *gart_start, vram_start,
                                           (unsigned long long)
-                                          (vram_addr - adev->mc.vram_start +
+                                          (vram_addr - adev->gmc.vram_start +
                                            (void*)vram_start - vram_map),
                                           (unsigned long long)
-                                          (gart_addr - adev->mc.gart_start +
+                                          (gart_addr - adev->gmc.gart_start +
                                            (void*)vram_start - vram_map));
                                 amdgpu_bo_kunmap(gtt_obj[i]);
                                 goto out_lclean_unpin;
@@ -200,7 +199,7 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                 amdgpu_bo_kunmap(gtt_obj[i]);
 
                 DRM_INFO("Tested GTT->VRAM and VRAM->GTT copy for GTT offset 0x%llx\n",
-                         gart_addr - adev->mc.gart_start);
+                         gart_addr - adev->gmc.gart_start);
                 continue;
 
 out_lclean_unpin: