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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 98e3bf890d5be9859b6a54716f67800c5fec86b6..e3ed08dca7b7d2e6ff8ef7c486dd2e5917834d9b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -280,6 +280,12 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,
                goto allocate_mem_pin_bo_failed;
        }
 
+       r = amdgpu_ttm_alloc_gart(&bo->tbo);
+       if (r) {
+               dev_err(adev->dev, "%p bind failed\n", bo);
+               goto allocate_mem_kmap_bo_failed;
+       }
+
        r = amdgpu_bo_kmap(bo, &cpu_ptr_tmp);
        if (r) {
                dev_err(adev->dev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c
index cb88d7e8b96b1e25bfd8fc931563ac0957a2eb35..3079ea8523c55db1110e55a98b81dcbca667e576 100644 (file)
--- 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);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index a80407cf099b7695be795e7dd560ad4e006eb9f3..6748cd7fc129b0e7b83966da865f674c676c04e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -194,6 +194,12 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
                goto unreserve;
        }
 
+       r = amdgpu_ttm_alloc_gart(&new_abo->tbo);
+       if (unlikely(r != 0)) {
+               DRM_ERROR("%p bind failed\n", new_abo);
+               goto unpin;
+       }
+
        r = reservation_object_get_fences_rcu(new_abo->tbo.resv, &work->excl,
                                              &work->shared_count,
                                              &work->shared);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index c93fd9a6b59cb355ba05124f90babc2f81970275..d44b76455e896a539d9c859914059746fe70d25b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -173,6 +173,14 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
                amdgpu_bo_unreserve(abo);
                goto out_unref;
        }
+
+       ret = amdgpu_ttm_alloc_gart(&abo->tbo);
+       if (ret) {
+               amdgpu_bo_unreserve(abo);
+               dev_err(adev->dev, "%p bind failed\n", abo);
+               goto out_unref;
+       }
+
        ret = amdgpu_bo_kmap(abo, NULL);
        amdgpu_bo_unreserve(abo);
        if (ret) {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 79cdbf1b9dc9829be7d2eba04b03f455966556a0..7f7c2212aeddf51c45805064bde2d028c431f286 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -257,6 +257,13 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
                dev_err(adev->dev, "(%d) kernel bo pin failed\n", r);
                goto error_unreserve;
        }
+
+       r = amdgpu_ttm_alloc_gart(&(*bo_ptr)->tbo);
+       if (r) {
+               dev_err(adev->dev, "%p bind failed\n", *bo_ptr);
+               goto error_unpin;
+       }
+
        if (gpu_addr)
                *gpu_addr = amdgpu_bo_gpu_offset(*bo_ptr);
 
@@ -270,6 +277,8 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
 
        return 0;
 
+error_unpin:
+       amdgpu_bo_unpin(*bo_ptr);
 error_unreserve:
        amdgpu_bo_unreserve(*bo_ptr);
 
@@ -903,12 +912,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
                goto error;
        }
 
-       r = amdgpu_ttm_alloc_gart(&bo->tbo);
-       if (unlikely(r)) {
-               dev_err(adev->dev, "%p bind failed\n", bo);
-               goto error;
-       }
-
        bo->pin_count = 1;
 
        domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index 007d70cd69ddbf38d3cedc83c6443d8169926636..8904e62dca7ae277143f4a3cbdffaa28ef120bf9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -103,6 +103,11 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                        DRM_ERROR("Failed to pin GTT object %d\n", i);
                        goto out_lclean_unres;
                }
+               r = amdgpu_ttm_alloc_gart(&gtt_obj[i]->tbo);
+               if (r) {
+                       DRM_ERROR("%p bind failed\n", gtt_obj[i]);
+                       goto out_lclean_unpin;
+               }
                gart_addr = amdgpu_bo_gpu_offset(gtt_obj[i]);
 
                r = amdgpu_bo_kmap(gtt_obj[i], &gtt_map);

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 02d83c97f10b50ca51ef22932d19b81ca097a8e5..d2cc32add5f7667dc30f589e6f3a564a28bae223 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3095,13 +3095,22 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
                domain = AMDGPU_GEM_DOMAIN_VRAM;
 
        r = amdgpu_bo_pin(rbo, domain);
-       amdgpu_bo_unreserve(rbo);
-
        if (unlikely(r != 0)) {
                if (r != -ERESTARTSYS)
                        DRM_ERROR("Failed to pin framebuffer with error %d\n", r);
+               amdgpu_bo_unreserve(rbo);
+               return r;
+       }
+
+       r = amdgpu_ttm_alloc_gart(&rbo->tbo);
+       if (unlikely(r != 0)) {
+               amdgpu_bo_unpin(rbo);
+               amdgpu_bo_unreserve(rbo);
+               DRM_ERROR("%p bind failed\n", rbo);
                return r;
        }
+       amdgpu_bo_unreserve(rbo);
+
        afb->address = amdgpu_bo_gpu_offset(rbo);
 
        amdgpu_bo_ref(rbo);