drm/amdgpu: fix number of fence calculations

From Christian Koenig
0d4e60e23c7d6a54f80e1b8ceec9a8c3df736dad in linux-6.1.y/6.1.39
570b295248b00c3cf4cf59e397de5cb2361e10c2 in mainline linux

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_cs.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_cs.c
index dea0fc8..8f9a1cf 100644 (file)
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_cs.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_cs.c
@@ -129,9 +129,6 @@ static int amdgpu_cs_p1_user_fence(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;
-       /* One for TTM and two for the CS job */
-       p->uf_entry.tv.num_shared = 3;
-
        drm_gem_object_put(gobj);
 
        size = amdgpu_bo_size(bo);
@@ -885,15 +882,19 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
 
        mutex_lock(&p->bo_list->bo_list_mutex);
 
-       /* One for TTM and one for the CS job */
+       /* One for TTM and one for each CS job */
        amdgpu_bo_list_for_each_entry(e, p->bo_list)
-               e->tv.num_shared = 2;
+               e->tv.num_shared = 1 + p->gang_size;
+       p->uf_entry.tv.num_shared = 1 + p->gang_size;
 
        amdgpu_bo_list_get_list(p->bo_list, &p->validated);
 
        INIT_LIST_HEAD(&duplicates);
        amdgpu_vm_get_pd_bo(&fpriv->vm, &p->validated, &p->vm_pd);
 
+       /* Two for VM updates, one for TTM and one for each CS job */
+       p->vm_pd.tv.num_shared = 3 + p->gang_size;
+
        if (p->uf_entry.tv.bo && !ttm_to_amdgpu_bo(p->uf_entry.tv.bo)->parent)
                list_add(&p->uf_entry.tv.head, &p->validated);