diff options
| author | Christian König <[email protected]> | 2015-09-02 16:14:57 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2015-09-02 16:19:52 +0000 |
| commit | 8221d706f4f39337e28644f333aefbca41ac0d18 (patch) | |
| tree | aebea002ef1a55d24be780a3ee0df7b4d0475c29 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |
| parent | Add radeon suspend/resume quirk for HP Compaq dc5750. (diff) | |
| download | kernel-8221d706f4f39337e28644f333aefbca41ac0d18.tar.gz kernel-8221d706f4f39337e28644f333aefbca41ac0d18.zip | |
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 <[email protected]>
Reviewed-by: Chunming Zhou <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
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, } while (amdgpu_sa_bo_next_hole(sa_manager, fences, tries)); spin_unlock(&sa_manager->wq.lock); - t = amdgpu_fence_wait_multiple(adev, fences, AMDGPU_MAX_RINGS, false, false, - MAX_SCHEDULE_TIMEOUT); + t = amdgpu_fence_wait_any(adev, fences, AMDGPU_MAX_RINGS, + false, MAX_SCHEDULE_TIMEOUT); r = (t > 0) ? 0 : t; spin_lock(&sa_manager->wq.lock); /* if we have nothing to wait for block */ |