6 files changed, 22 insertions, 47 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 771995093cac..c942f6b4be1b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2574,43 +2574,35 @@ static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size)
 }
 
 /**
- * amdgpu_vm_set_fragment_size - adjust fragment size in PTE
- *
- * @adev: amdgpu_device pointer
- * @fragment_size_default: the default fragment size if it's set auto
- */
-void amdgpu_vm_set_fragment_size(struct amdgpu_device *adev,
-                                 uint32_t fragment_size_default)
-{
-        if (amdgpu_vm_fragment_size == -1)
-                adev->vm_manager.fragment_size = fragment_size_default;
-        else
-                adev->vm_manager.fragment_size = amdgpu_vm_fragment_size;
-}
-
-/**
  * amdgpu_vm_adjust_size - adjust vm size, block size and fragment size
  *
  * @adev: amdgpu_device pointer
  * @vm_size: the default vm size if it's set auto
  */
 void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
-                           uint32_t fragment_size_default)
+                           uint32_t fragment_size_default, unsigned max_level)
 {
-        /* adjust vm size firstly */
-        if (amdgpu_vm_size != -1)
+        /* adjust vm size first, but only for two level setups for now */
+        if (amdgpu_vm_size != -1 && max_level == 1)
                 vm_size = amdgpu_vm_size;
 
         adev->vm_manager.max_pfn = (uint64_t)vm_size << 18;
+        adev->vm_manager.num_level = max_level;
 
-        /* block size depends on vm size */
-        if (amdgpu_vm_block_size == -1)
+        /* block size depends on vm size and hw setup*/
+        if (adev->vm_manager.num_level > 1)
+                /* Use fixed block_size for multi level page tables */
+                adev->vm_manager.block_size = 9;
+        else if (amdgpu_vm_block_size == -1)
                 adev->vm_manager.block_size =
                         amdgpu_vm_get_block_size(vm_size);
         else
                 adev->vm_manager.block_size = amdgpu_vm_block_size;
 
-        amdgpu_vm_set_fragment_size(adev, fragment_size_default);
+        if (amdgpu_vm_fragment_size == -1)
+                adev->vm_manager.fragment_size = fragment_size_default;
+        else
+                adev->vm_manager.fragment_size = amdgpu_vm_fragment_size;
 
         DRM_INFO("vm size is %u GB, block size is %u-bit, fragment size is %u-bit\n",
                  vm_size, adev->vm_manager.block_size,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index c80d45dd2bd3..54e540d5e8d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -324,10 +324,8 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
                                                          uint64_t addr);
 void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
                       struct amdgpu_bo_va *bo_va);
-void amdgpu_vm_set_fragment_size(struct amdgpu_device *adev,
-                                 uint32_t fragment_size_default);
 void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
-                           uint32_t fragment_size_default);
+                           uint32_t fragment_size_default, unsigned max_level);
 int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);
 bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring,
                                   struct amdgpu_job *job);
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
index 6098c773711f..49224bf38324 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
@@ -832,7 +832,7 @@ static int gmc_v6_0_sw_init(void *handle)
         if (r)
                 return r;
 
-        amdgpu_vm_adjust_size(adev, 64, 9);
+        amdgpu_vm_adjust_size(adev, 64, 9, 1);
 
         adev->mc.mc_mask = 0xffffffffffULL;
 
@@ -877,7 +877,6 @@ static int gmc_v6_0_sw_init(void *handle)
          * amdkfd will use VMIDs 8-15
          */
         adev->vm_manager.id_mgr[0].num_ids = AMDGPU_NUM_OF_VMIDS;
-        adev->vm_manager.num_level = 1;
         amdgpu_vm_manager_init(adev);
 
         /* base offset of vram pages */
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 8b460e9d4431..c39cf8440afd 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -971,7 +971,7 @@ static int gmc_v7_0_sw_init(void *handle)
          * Currently set to 4GB ((1 << 20) 4k pages).
          * Max GPUVM size for cayman and SI is 40 bits.
          */
-        amdgpu_vm_adjust_size(adev, 64, 9);
+        amdgpu_vm_adjust_size(adev, 64, 9, 1);
 
         /* Set the internal MC address mask
          * This is the max address of the GPU's
@@ -1026,7 +1026,6 @@ static int gmc_v7_0_sw_init(void *handle)
          * amdkfd will use VMIDs 8-15
          */
         adev->vm_manager.id_mgr[0].num_ids = AMDGPU_NUM_OF_VMIDS;
-        adev->vm_manager.num_level = 1;
         amdgpu_vm_manager_init(adev);
 
         /* base offset of vram pages */
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 1fd7f9daab0a..421e751a0464 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1068,7 +1068,7 @@ static int gmc_v8_0_sw_init(void *handle)
          * Currently set to 4GB ((1 << 20) 4k pages).
          * Max GPUVM size for cayman and SI is 40 bits.
          */
-        amdgpu_vm_adjust_size(adev, 64, 9);
+        amdgpu_vm_adjust_size(adev, 64, 9, 1);
 
         /* Set the internal MC address mask
          * This is the max address of the GPU's
@@ -1123,7 +1123,6 @@ static int gmc_v8_0_sw_init(void *handle)
          * amdkfd will use VMIDs 8-15
          */
         adev->vm_manager.id_mgr[0].num_ids = AMDGPU_NUM_OF_VMIDS;
-        adev->vm_manager.num_level = 1;
         amdgpu_vm_manager_init(adev);
 
         /* base offset of vram pages */
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 30eb625a991c..729e4d591293 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -769,16 +769,11 @@ static int gmc_v9_0_sw_init(void *handle)
         switch (adev->asic_type) {
         case CHIP_RAVEN:
                 adev->mc.vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
-                if (adev->rev_id == 0x0 || adev->rev_id == 0x1) {
-                        adev->vm_manager.max_pfn = 1ULL << 36;
-                        adev->vm_manager.block_size = 9;
-                        adev->vm_manager.num_level = 3;
-                        amdgpu_vm_set_fragment_size(adev, 9);
-                } else {
+                if (adev->rev_id == 0x0 || adev->rev_id == 0x1)
+                        amdgpu_vm_adjust_size(adev, 256 * 1024, 9, 3);
+                else
                         /* vm_size is 64GB for legacy 2-level page support */
-                        amdgpu_vm_adjust_size(adev, 64, 9);
-                        adev->vm_manager.num_level = 1;
-                }
+                        amdgpu_vm_adjust_size(adev, 64, 9, 1);
                 break;
         case CHIP_VEGA10:
                 /* XXX Don't know how to get VRAM type yet. */
@@ -788,19 +783,12 @@ static int gmc_v9_0_sw_init(void *handle)
                  * vm size is 256TB (48bit), maximum size of Vega10,
                  * block size 512 (9bit)
                  */
-                adev->vm_manager.max_pfn = 1ULL << 36;
-                adev->vm_manager.block_size = 9;
-                adev->vm_manager.num_level = 3;
-                amdgpu_vm_set_fragment_size(adev, 9);
+                amdgpu_vm_adjust_size(adev, 256 * 1024, 9, 3);
                 break;
         default:
                 break;
         }
 
-        DRM_INFO("vm size is %llu GB, block size is %u-bit, fragment size is %u-bit\n",
-                 adev->vm_manager.max_pfn >> 18, adev->vm_manager.block_size,
-                 adev->vm_manager.fragment_size);
-
         /* This interrupt is VMC page fault.*/
         r = amdgpu_irq_add_id(adev, AMDGPU_IH_CLIENTID_VMC, 0,
                                 &adev->mc.vm_fault);