drm/amdgpu: cache the fence to wait for a VMID

Beneficial when a lot of processes are waiting for VMIDs.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
index 156e026046b5e489c0f02c1d243fdaf8524c8b0a..7d2805729c201d2dd71a6abf988ca202081de0b1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -205,6 +205,9 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm,
        unsigned i;
        int r;
 
+       if (ring->vmid_wait && !dma_fence_is_signaled(ring->vmid_wait))
+               return amdgpu_sync_fence(adev, sync, ring->vmid_wait, false);
+
        fences = kmalloc_array(sizeof(void *), id_mgr->num_ids, GFP_KERNEL);
        if (!fences)
                return -ENOMEM;
@@ -239,9 +242,9 @@ static int amdgpu_vmid_grab_idle(struct amdgpu_vm *vm,
                }
 
                r = amdgpu_sync_fence(adev, sync, &array->base, false);
-               dma_fence_put(&array->base);
+               dma_fence_put(ring->vmid_wait);
+               ring->vmid_wait = &array->base;
                return r;
-
        }
        kfree(fences);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 13044e66dcaf4e6ab0b79fab23aef8db987170db..e223b0f6417bcc620cbf3a7493d538663fc7af79 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -360,6 +360,9 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
 
        amdgpu_debugfs_ring_fini(ring);
 
+       dma_fence_put(ring->vmid_wait);
+       ring->vmid_wait = NULL;
+
        ring->adev->rings[ring->idx] = NULL;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 867f53332305d0b104c12d3f2244bc42c255f7ea..0759768556517f7bfd99c182eb82186737222e41 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
@@ -196,6 +196,7 @@ struct amdgpu_ring {
        u64                     cond_exe_gpu_addr;
        volatile u32            *cond_exe_cpu_addr;
        unsigned                vm_inv_eng;
+       struct dma_fence        *vmid_wait;
        bool                    has_compute_vm_bug;
 
        atomic_t                num_jobs[DRM_SCHED_PRIORITY_MAX];