1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index eb20987ce18d..d6398cf45f24 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -160,7 +160,8 @@ static void amdgpu_sa_bo_try_free(struct amdgpu_sa_manager *sa_manager)
 
         sa_bo = list_entry(sa_manager->hole->next, struct amdgpu_sa_bo, olist);
         list_for_each_entry_safe_from(sa_bo, tmp, &sa_manager->olist, olist) {
-                if (sa_bo->fence == NULL || !amdgpu_fence_signaled(sa_bo->fence)) {
+                if (sa_bo->fence == NULL ||
+                    !fence_is_signaled(&sa_bo->fence->base)) {
                         return;
                 }
                 amdgpu_sa_bo_remove_locked(sa_bo);
@@ -274,7 +275,7 @@ static bool amdgpu_sa_bo_next_hole(struct amdgpu_sa_manager *sa_manager,
                 sa_bo = list_first_entry(&sa_manager->flist[i],
                                          struct amdgpu_sa_bo, flist);
 
-                if (!amdgpu_fence_signaled(sa_bo->fence)) {
+                if (!fence_is_signaled(&sa_bo->fence->base)) {
                         fences[i] = sa_bo->fence;
                         continue;
                 }
@@ -317,6 +318,7 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
         struct amdgpu_fence *fences[AMDGPU_MAX_RINGS];
         unsigned tries[AMDGPU_MAX_RINGS];
         int i, r;
+        signed long t;
 
         BUG_ON(align > sa_manager->align);
         BUG_ON(size > sa_manager->size);
@@ -350,7 +352,8 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev,
                 } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries));
 
                 spin_unlock(&sa_manager->wq.lock);
-                r = amdgpu_fence_wait_any(adev, fences, false);
+                t = amdgpu_fence_wait_any(adev, fences, false, MAX_SCHEDULE_TIMEOUT);
+                r = (t > 0) ? 0 : t;
                 spin_lock(&sa_manager->wq.lock);
                 /* if we have nothing to wait for block */
                 if (r == -ENOENT) {
@@ -379,7 +382,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev, struct amdgpu_sa_bo **sa_bo,
 
         sa_manager = (*sa_bo)->manager;
         spin_lock(&sa_manager->wq.lock);
-        if (fence && !amdgpu_fence_signaled(fence)) {
+        if (fence && !fence_is_signaled(&fence->base)) {
                 (*sa_bo)->fence = amdgpu_fence_ref(fence);
                 list_add_tail(&(*sa_bo)->flist,
                               &sa_manager->flist[fence->ring->idx]);