aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-09-02 12:14:57 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-09-02 12:19:52 -0400
commit8221d706f4f39337e28644f333aefbca41ac0d18 (patch)
treeaebea002ef1a55d24be780a3ee0df7b4d0475c29 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent09bfda10e6efd7b65bcc29237bee1765ed779657 (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.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c6812f2e198e..b66938dbb5cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -440,12 +440,11 @@ int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
440int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); 440int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
441unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); 441unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring);
442 442
443signed long amdgpu_fence_wait_multiple(struct amdgpu_device *adev, 443signed long amdgpu_fence_wait_any(struct amdgpu_device *adev,
444 struct fence **array, 444 struct fence **array,
445 uint32_t count, 445 uint32_t count,
446 bool wait_all, 446 bool intr,
447 bool intr, 447 signed long t);
448 signed long t);
449struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence); 448struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence);
450void amdgpu_fence_unref(struct amdgpu_fence **fence); 449void amdgpu_fence_unref(struct amdgpu_fence **fence);
451 450