drm/amdgpu: allocate move entities dynamically

No functional change for now, as we always allocate a single entity.

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@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_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index b578c28f8d3af8da2fa65a876aa594b5b6531114..97448a055125c38daf08d3088fa315c8a28f6c39 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -399,7 +399,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
        dst.offset = 0;
 
        r = amdgpu_ttm_copy_mem_to_mem(adev,
-                                      &adev->mman.move_entity,
+                                      &adev->mman.move_entities[0],
                                       &src, &dst,
                                       new_mem->size,
                                       amdgpu_bo_encrypted(abo),
@@ -412,7 +412,7 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo,
            (abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) {
                struct dma_fence *wipe_fence = NULL;
 
-               r = amdgpu_fill_buffer(&adev->mman.move_entity,
+               r = amdgpu_fill_buffer(&adev->mman.move_entities[0],
                                       abo, 0, NULL, &wipe_fence,
                                       AMDGPU_KERNEL_JOB_ID_MOVE_BLIT);
                if (r) {
@@ -2335,7 +2335,7 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev)
 void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
 {
        struct ttm_resource_manager *man = ttm_manager_type(&adev->mman.bdev, TTM_PL_VRAM);
-       u32 num_clear_entities;
+       u32 num_clear_entities, num_move_entities;
        uint64_t size;
        int r, i, j;
 
@@ -2353,6 +2353,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
                }
 
                num_clear_entities = 1;
+               num_move_entities = 1;
                ring = adev->mman.buffer_funcs_ring;
                sched = &ring->sched;
                r = amdgpu_ttm_buffer_entity_init(&adev->mman.gtt_mgr,
@@ -2389,14 +2390,20 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
                        }
                }
 
-               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_entities;
+               adev->mman.num_move_entities = num_move_entities;
+               for (i = 0; i < num_move_entities; i++) {
+                       r = amdgpu_ttm_buffer_entity_init(
+                               &adev->mman.gtt_mgr,
+                               &adev->mman.move_entities[i],
+                               DRM_SCHED_PRIORITY_NORMAL, &sched, 1, 2);
+
+                       if (r < 0) {
+                               for (j = 0; j < i; j++)
+                                       amdgpu_ttm_buffer_entity_fini(
+                                               &adev->mman.gtt_mgr, &adev->mman.move_entities[j]);
+                               adev->mman.num_move_entities = 0;
+                               goto error_free_clear_entities;
+                       }
                }
        } else {
                amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
@@ -2404,8 +2411,9 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
                for (i = 0; i < adev->mman.num_clear_entities; i++)
                        amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
                                                      &adev->mman.clear_entities[i]);
-               amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
-                                             &adev->mman.move_entity);
+               for (i = 0; i < adev->mman.num_move_entities; i++)
+                       amdgpu_ttm_buffer_entity_fini(&adev->mman.gtt_mgr,
+                                                     &adev->mman.move_entities[i]);
                /* Drop all the old fences since re-creating the scheduler entities
                 * will allocate new contexts.
                 */
@@ -2413,6 +2421,7 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)
                kfree(adev->mman.clear_entities);
                adev->mman.clear_entities = NULL;
                adev->mman.num_clear_entities = 0;
+               adev->mman.num_move_entities = 0;
        }
 
        /* this just adjusts TTM size idea, which sets lpfn to the correct value */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index e98d458b8029d21d1e27d60d8663d7c832e5df5e..cd24ca851b6d37182db0fd598219b0e730f97c39 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -72,9 +72,10 @@ struct amdgpu_mman {
 
        /* @default_entity: for workarounds, has no gart windows */
        struct amdgpu_ttm_buffer_entity default_entity;
-       struct amdgpu_ttm_buffer_entity move_entity;
        struct amdgpu_ttm_buffer_entity *clear_entities;
        u32 num_clear_entities;
+       struct amdgpu_ttm_buffer_entity move_entities[TTM_NUM_MOVE_FENCES];
+       u32 num_move_entities;
 
        struct amdgpu_vram_mgr vram_mgr;
        struct amdgpu_gtt_mgr gtt_mgr;

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
index 10bc81ce37cbf04ebf9b63633248e190004f6c74..964efa32590893137f4edf172560e538297353e6 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@ -136,7 +136,7 @@ svm_migrate_copy_memory_gart(struct amdgpu_device *adev, dma_addr_t *sys,
        u64 size;
        int r;
 
-       entity = &adev->mman.move_entity;
+       entity = &adev->mman.move_entities[0];
 
        mutex_lock(&entity->lock);