drm/amdgpu: always reserve one more shared slot for pipelined BO moves

This allows us to drop the extra reserve in TTM.

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, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 8cc640abe3de..4a6a1d4a88ea 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -50,7 +50,8 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
         bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));
         p->uf_entry.priority = 0;
         p->uf_entry.tv.bo = &bo->tbo;
-        p->uf_entry.tv.num_shared = 1;
+        /* One for TTM and one for the CS job */
+        p->uf_entry.tv.num_shared = 2;
         p->uf_entry.user_pages = NULL;
 
         drm_gem_object_put_unlocked(gobj);
@@ -598,8 +599,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
                         return r;
         }
 
+        /* One for TTM and one for the CS job */
         amdgpu_bo_list_for_each_entry(e, p->bo_list)
-                e->tv.num_shared = 1;
+                e->tv.num_shared = 2;
 
         amdgpu_bo_list_get_list(p->bo_list, &p->validated);
         if (p->bo_list->first_userptr != p->bo_list->num_entries)