diff options
author | Christian König <christian.koenig@amd.com> | 2015-09-02 12:14:57 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-09-02 12:19:52 -0400 |
commit | 8221d706f4f39337e28644f333aefbca41ac0d18 (patch) | |
tree | aebea002ef1a55d24be780a3ee0df7b4d0475c29 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |
parent | 09bfda10e6efd7b65bcc29237bee1765ed779657 (diff) |
drm/amdgpu: partially revert "modify amdgpu_fence_wait_any() to amdgpu_fence_wait_multiple()" v2
That isn't used any more.
v2: rebase
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c index b92525329d6c..74dad270362c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |||
@@ -367,8 +367,8 @@ int amdgpu_sa_bo_new(struct amdgpu_device *adev, | |||
367 | } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries)); | 367 | } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries)); |
368 | 368 | ||
369 | spin_unlock(&sa_manager->wq.lock); | 369 | spin_unlock(&sa_manager->wq.lock); |
370 | t = amdgpu_fence_wait_multiple(adev, fences, AMDGPU_MAX_RINGS, false, false, | 370 | t = amdgpu_fence_wait_any(adev, fences, AMDGPU_MAX_RINGS, |
371 | MAX_SCHEDULE_TIMEOUT); | 371 | false, MAX_SCHEDULE_TIMEOUT); |
372 | r = (t > 0) ? 0 : t; | 372 | r = (t > 0) ? 0 : t; |
373 | spin_lock(&sa_manager->wq.lock); | 373 | spin_lock(&sa_manager->wq.lock); |
374 | /* if we have nothing to wait for block */ | 374 | /* if we have nothing to wait for block */ |