drm/amdgpu: allocate gart memory when it's required (v3)

Instead of calling gart address space on every bo pin,
allocates it on demand

v2: fix error handling
v3: drop the change on amdgpu_amdkfd_gpuvm.c, not needed.

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
index cb88d7e8b96b..3079ea8523c5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
@@ -96,11 +96,16 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size,
         if (unlikely(r != 0))
                 goto out_cleanup;
         r = amdgpu_bo_pin(sobj, sdomain);
-        saddr = amdgpu_bo_gpu_offset(sobj);
+        if (r) {
+                amdgpu_bo_unreserve(sobj);
+                goto out_cleanup;
+        }
+        r = amdgpu_ttm_alloc_gart(&sobj->tbo);
         amdgpu_bo_unreserve(sobj);
         if (r) {
                 goto out_cleanup;
         }
+        saddr = amdgpu_bo_gpu_offset(sobj);
         bp.domain = ddomain;
         r = amdgpu_bo_create(adev, &bp, &dobj);
         if (r) {
@@ -110,11 +115,16 @@ static void amdgpu_benchmark_move(struct amdgpu_device *adev, unsigned size,
         if (unlikely(r != 0))
                 goto out_cleanup;
         r = amdgpu_bo_pin(dobj, ddomain);
-        daddr = amdgpu_bo_gpu_offset(dobj);
+        if (r) {
+                amdgpu_bo_unreserve(sobj);
+                goto out_cleanup;
+        }
+        r = amdgpu_ttm_alloc_gart(&dobj->tbo);
         amdgpu_bo_unreserve(dobj);
         if (r) {
                 goto out_cleanup;
         }
+        daddr = amdgpu_bo_gpu_offset(dobj);
 
         if (adev->mman.buffer_funcs) {
                 time = amdgpu_benchmark_do_move(adev, size, saddr, daddr, n);