diff options
| author | Junwei Zhang <[email protected]> | 2016-11-04 20:16:10 +0000 |
|---|---|---|
| committer | Sumit Semwal <[email protected]> | 2016-11-08 18:58:42 +0000 |
| commit | eef18a827a9ec58aa9fc1ccfb7e65ff04ebc25f3 (patch) | |
| tree | 49c837bcadf201bcdf4a4002edd9b4dc683de573 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | |
| parent | dma-buf: return index of the first signaled fence (v2) (diff) | |
| download | kernel-eef18a827a9ec58aa9fc1ccfb7e65ff04ebc25f3.tar.gz kernel-eef18a827a9ec58aa9fc1ccfb7e65ff04ebc25f3.zip | |
drm/amdgpu: add the interface of waiting multiple fences (v4)
v2: agd: rebase and squash in all the previous optimizations and
changes so everything compiles.
v3: squash in Slava's 32bit build fix
v4: rebase on drm-next (fence -> dma_fence),
squash in Monk's ioctl update patch
Signed-off-by: Junwei Zhang <[email protected]>
Reviewed-by: Monk Liu <[email protected]>
Reviewed-by: Jammy Zhou <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Sumit Semwal <[email protected]>
[sumits: fix checkpatch warnings]
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c index fd26c4b8d793..34a795463988 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c @@ -361,7 +361,8 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, if (count) { spin_unlock(&sa_manager->wq.lock); t = dma_fence_wait_any_timeout(fences, count, false, - MAX_SCHEDULE_TIMEOUT); + MAX_SCHEDULE_TIMEOUT, + NULL); for (i = 0; i < count; ++i) dma_fence_put(fences[i]); |