aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-08-06 11:49:25 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:51:08 -0400
commit3cdb8119d95411ddbca9f9af13b72e4afce6e6d2 (patch)
tree53809292e4bfd4f4f3f955f786decf2dfffc18cd /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
parentf556cb0caeec1ba9b8e5e2aa85b47e76277f5d4b (diff)
drm/amdgpu: remove amdgpu_fence_signaled
The common kernel function does the same thing. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index f4e20eaede82..c5b17262529d 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)
160 160
161 sa_bo = list_entry(sa_manager->hole->next, struct amdgpu_sa_bo, olist); 161 sa_bo = list_entry(sa_manager->hole->next, struct amdgpu_sa_bo, olist);
162 list_for_each_entry_safe_from(sa_bo, tmp, &sa_manager->olist, olist) { 162 list_for_each_entry_safe_from(sa_bo, tmp, &sa_manager->olist, olist) {
163 if (sa_bo->fence == NULL || !amdgpu_fence_signaled(sa_bo->fence)) { 163 if (sa_bo->fence == NULL ||
164 !fence_is_signaled(&sa_bo->fence->base)) {
164 return; 165 return;
165 } 166 }
166 amdgpu_sa_bo_remove_locked(sa_bo); 167 amdgpu_sa_bo_remove_locked(sa_bo);
@@ -274,7 +275,7 @@ static bool amdgpu_sa_bo_next_hole(struct amdgpu_sa_manager *sa_manager,
274 sa_bo = list_first_entry(&sa_manager->flist[i], 275 sa_bo = list_first_entry(&sa_manager->flist[i],
275 struct amdgpu_sa_bo, flist); 276 struct amdgpu_sa_bo, flist);
276 277
277 if (!amdgpu_fence_signaled(sa_bo->fence)) { 278 if (!fence_is_signaled(&sa_bo->fence->base)) {
278 fences[i] = sa_bo->fence; 279 fences[i] = sa_bo->fence;
279 continue; 280 continue;
280 } 281 }
@@ -380,7 +381,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev, struct amdgpu_sa_bo **sa_bo,
380 381
381 sa_manager = (*sa_bo)->manager; 382 sa_manager = (*sa_bo)->manager;
382 spin_lock(&sa_manager->wq.lock); 383 spin_lock(&sa_manager->wq.lock);
383 if (fence && !amdgpu_fence_signaled(fence)) { 384 if (fence && !fence_is_signaled(&fence->base)) {
384 (*sa_bo)->fence = amdgpu_fence_ref(fence); 385 (*sa_bo)->fence = amdgpu_fence_ref(fence);
385 list_add_tail(&(*sa_bo)->flist, 386 list_add_tail(&(*sa_bo)->flist,
386 &sa_manager->flist[fence->ring->idx]); 387 &sa_manager->flist[fence->ring->idx]);