drm/amdgpu: lock the eviction fence for wq signals it

Lock and refer to the eviction fence before the eviction fence
schedules work queue tries to signal it.

Suggested-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Arvind Yadav <Arvind.Yadav@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_eviction_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
index 73b629b5f56fc97b1c2d09c388e2bc60b70e5156..8b919ad3af29ea99aa28585ef3a7eae8dcfd9d59 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
@@ -108,13 +108,22 @@ amdgpu_eviction_fence_suspend_worker(struct work_struct *work)
        struct amdgpu_eviction_fence *ev_fence;
 
        mutex_lock(&uq_mgr->userq_mutex);
+       spin_lock(&evf_mgr->ev_fence_lock);
        ev_fence = evf_mgr->ev_fence;
-       if (!ev_fence)
+       if (ev_fence)
+               dma_fence_get(&ev_fence->base);
+       else
                goto unlock;
+       spin_unlock(&evf_mgr->ev_fence_lock);
 
        amdgpu_userq_evict(uq_mgr, ev_fence);
 
+       mutex_unlock(&uq_mgr->userq_mutex);
+       dma_fence_put(&ev_fence->base);
+       return;
+
 unlock:
+       spin_unlock(&evf_mgr->ev_fence_lock);
        mutex_unlock(&uq_mgr->userq_mutex);
 }