amdgpu/ttm: use amdgpu_gtt_mgr_alloc_entries

Use amdgpu_gtt_mgr_alloc_entries for each entity instead
of reserving a fixed number of pages.

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@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_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d422b781078a38bf8fe0696f1faaac87154b87c3..9c8f1b3e1b1b09ad3906ef099a42ab2ce1ba85a3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -2011,37 +2011,47 @@ static void amdgpu_ttm_free_mmio_remap_bo(struct amdgpu_device *adev)
        adev->rmmio_remap.bo = NULL;
 }
 
-static int amdgpu_ttm_buffer_entity_init(struct amdgpu_ttm_buffer_entity *entity,
+static int amdgpu_ttm_buffer_entity_init(struct amdgpu_gtt_mgr *mgr,
+                                        struct amdgpu_ttm_buffer_entity *entity,
                                         enum drm_sched_priority prio,
                                         struct drm_gpu_scheduler **scheds,
                                         int num_schedulers,
-                                        int starting_gart_window,
                                         u32 num_gart_windows)
 {
-       int i, r;
+       int i, r, num_pages;
 
        r = drm_sched_entity_init(&entity->base, prio, scheds, num_schedulers, NULL);
        if (r)
                return r;
 
-
        mutex_init(&entity->lock);
 
        if (ARRAY_SIZE(entity->gart_window_offs) < num_gart_windows)
-               return starting_gart_window;
+               return -EINVAL;
+       if (num_gart_windows == 0)
+               return 0;
+
+       num_pages = num_gart_windows * AMDGPU_GTT_MAX_TRANSFER_SIZE;
+       r = amdgpu_gtt_mgr_alloc_entries(mgr, &entity->gart_node, num_pages,
+                                        DRM_MM_INSERT_BEST);
+       if (r) {
+               drm_sched_entity_destroy(&entity->base);
+               return r;
+       }
 
        for (i = 0; i < num_gart_windows; i++) {
                entity->gart_window_offs[i] =
-                       (u64)starting_gart_window * AMDGPU_GTT_MAX_TRANSFER_SIZE *
-                               AMDGPU_GPU_PAGE_SIZE;
-               starting_gart_window++;
+                       amdgpu_gtt_node_to_byte_offset(&entity->gart_node) +
+                               i * AMDGPU_GTT_MAX_TRANSFER_SIZE * PAGE_SIZE;
        }
 
-       return starting_gart_window;
+       return 0;
 }
 
-static void amdgpu_ttm_buffer_entity_fini(struct amdgpu_ttm_buffer_entity *entity)
+static void amdgpu_ttm_buffer_entity_fini(struct amdgpu_gtt_mgr *mgr,
+                                         struct amdgpu_ttm_buffer_entity *entity)
 {
+       amdgpu_gtt_mgr_free_entries(mgr, &entity->gart_node);
        drm_sched_entity_destroy(&entity->base);
 }
 
@@ -2345,36 +2355,42 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
 
                ring = adev->mman.buffer_funcs_ring;
                sched = &ring->sched;
-               r = amdgpu_ttm_buffer_entity_init(&adev->mman.default_entity,
-                                                 DRM_SCHED_PRIORITY_KERNEL, &sched, 1,
-                                                 0, 0);
+               r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
+                                                 &adev->mman.default_entity,
+                                                 DRM_SCHED_PRIORITY_KERNEL,
+                                                 &sched, 1, 0);
                if (r < 0) {
                        dev_err(adev->dev,
                                "Failed setting up TTM entity (%d)\n", r);
                        return;
                }
 
-               r = amdgpu_ttm_buffer_entity_init(&adev->mman.clear_entity,
-                                                 DRM_SCHED_PRIORITY_NORMAL, &sched, 1,
-                                                 r, 1);
+               r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
+                                                 &adev->mman.clear_entity,
+                                                 DRM_SCHED_PRIORITY_NORMAL,
+                                                 &sched, 1, 1);
                if (r < 0) {
                        dev_err(adev->dev,
                                "Failed setting up TTM BO clear entity (%d)\n", r);
                        goto error_free_default_entity;
                }
 
-               r = amdgpu_ttm_buffer_entity_init(&adev->mman.move_entity,
-                                                 DRM_SCHED_PRIORITY_NORMAL, &sched, 1,
-                                                 r, 2);
+               r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
+                                                 &adev->mman.move_entity,
+                                                 DRM_SCHED_PRIORITY_NORMAL,
+                                                 &sched, 1, 2);
                if (r < 0) {
                        dev_err(adev->dev,
                                "Failed setting up TTM BO move entity (%d)\n", r);
                        goto error_free_clear_entity;
                }
        } else {
-               amdgpu_ttm_buffer_entity_fini(&adev->mman.default_entity);
-               amdgpu_ttm_buffer_entity_fini(&adev->mman.clear_entity);
-               amdgpu_ttm_buffer_entity_fini(&adev->mman.move_entity);
+               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                             &adev->mman.default_entity);
+               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                             &adev->mman.clear_entity);
+               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                             &adev->mman.move_entity);
                /* Drop all the old fences since re-creating the scheduler entities
                 * will allocate new contexts.
                 */
@@ -2392,9 +2408,11 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
        return;
 
 error_free_clear_entity:
-       amdgpu_ttm_buffer_entity_fini(&adev->mman.clear_entity);
+       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                     &adev->mman.clear_entity);
 error_free_default_entity:
-       amdgpu_ttm_buffer_entity_fini(&adev->mman.default_entity);
+       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                     &adev->mman.default_entity);
 }
 
 static int amdgpu_ttm_prepare_job(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index c43f352df95313d97180d5f33c66ae3310f3b4a6..8af0aab7608cbed5031b792c0b628b4dc3bce89c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -56,6 +56,7 @@ struct amdgpu_gtt_mgr {
 struct amdgpu_ttm_buffer_entity {
        struct drm_sched_entity base;
        struct mutex            lock;
+       struct drm_mm_node      gart_node;
        u64                     gart_window_offs[2];
 };