diff options
author | Christian König <christian.koenig@amd.com> | 2015-06-19 11:00:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-29 15:52:49 -0400 |
commit | 03507c4f2f63d8d98c2455cf4d192589fac553c7 (patch) | |
tree | 866a2e509f2de7bf285e8a74be0b323028cb4f53 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 7cebc728174424d67df91dfb14f8b6dc13bed993 (diff) |
drm/amdgpu: recreate fence from user seq
And use common fence infrastructure for the wait.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 963c4ba5dcba..01657830b470 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -425,6 +425,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, | |||
425 | unsigned irq_type); | 425 | unsigned irq_type); |
426 | int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner, | 426 | int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner, |
427 | struct amdgpu_fence **fence); | 427 | struct amdgpu_fence **fence); |
428 | int amdgpu_fence_recreate(struct amdgpu_ring *ring, void *owner, | ||
429 | uint64_t seq, struct amdgpu_fence **fence); | ||
428 | void amdgpu_fence_process(struct amdgpu_ring *ring); | 430 | void amdgpu_fence_process(struct amdgpu_ring *ring); |
429 | int amdgpu_fence_wait_next(struct amdgpu_ring *ring); | 431 | int amdgpu_fence_wait_next(struct amdgpu_ring *ring); |
430 | int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); | 432 | int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); |
@@ -435,9 +437,6 @@ int amdgpu_fence_wait(struct amdgpu_fence *fence, bool interruptible); | |||
435 | int amdgpu_fence_wait_any(struct amdgpu_device *adev, | 437 | int amdgpu_fence_wait_any(struct amdgpu_device *adev, |
436 | struct amdgpu_fence **fences, | 438 | struct amdgpu_fence **fences, |
437 | bool intr); | 439 | bool intr); |
438 | long amdgpu_fence_wait_seq_timeout(struct amdgpu_device *adev, | ||
439 | u64 *target_seq, bool intr, | ||
440 | long timeout); | ||
441 | struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence); | 440 | struct amdgpu_fence *amdgpu_fence_ref(struct amdgpu_fence *fence); |
442 | void amdgpu_fence_unref(struct amdgpu_fence **fence); | 441 | void amdgpu_fence_unref(struct amdgpu_fence **fence); |
443 | 442 | ||