drm/ttm: allow reserving more than one shared slot v3

Let's support simultaneous submissions to multiple engines.

v2: rename the field to num_shared and fix up all users
v3: rebased

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index f3129b912714..b29ef088fa14 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -535,7 +535,7 @@ static void add_kgd_mem_to_kfd_bo_list(struct kgd_mem *mem,
         struct amdgpu_bo *bo = mem->bo;
 
         INIT_LIST_HEAD(&entry->head);
-        entry->shared = true;
+        entry->num_shared = 1;
         entry->bo = &bo->tbo;
         mutex_lock(&process_info->lock);
         if (userptr)
@@ -676,7 +676,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem,
 
         ctx->kfd_bo.priority = 0;
         ctx->kfd_bo.tv.bo = &bo->tbo;
-        ctx->kfd_bo.tv.shared = true;
+        ctx->kfd_bo.tv.num_shared = 1;
         ctx->kfd_bo.user_pages = NULL;
         list_add(&ctx->kfd_bo.tv.head, &ctx->list);
 
@@ -740,7 +740,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem,
 
         ctx->kfd_bo.priority = 0;
         ctx->kfd_bo.tv.bo = &bo->tbo;
-        ctx->kfd_bo.tv.shared = true;
+        ctx->kfd_bo.tv.num_shared = 1;
         ctx->kfd_bo.user_pages = NULL;
         list_add(&ctx->kfd_bo.tv.head, &ctx->list);
 
@@ -1830,7 +1830,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info)
                             validate_list.head) {
                 list_add_tail(&mem->resv_list.head, &resv_list);
                 mem->resv_list.bo = mem->validate_list.bo;
-                mem->resv_list.shared = mem->validate_list.shared;
+                mem->resv_list.num_shared = mem->validate_list.num_shared;
         }
 
         /* Reserve all BOs and page tables for validation */
@@ -2049,7 +2049,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef)
 
                 list_add_tail(&mem->resv_list.head, &ctx.list);
                 mem->resv_list.bo = mem->validate_list.bo;
-                mem->resv_list.shared = mem->validate_list.shared;
+                mem->resv_list.num_shared = mem->validate_list.num_shared;
         }
 
         ret = ttm_eu_reserve_buffers(&ctx.ticket, &ctx.list,