aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu.h
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-16 11:39:39 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:48 -0500
commit364beb2cc45247e980a097e53d0932e143873333 (patch)
tree01aa4a62683d8d35a5c7908b1774e02bbb62dcf3 /drivers/gpu/drm/amd/amdgpu/amdgpu.h
parent257bf15a4b9795f8b352beb6e72a7e3e5aab8d27 (diff)
drm/amdgpu: return the common fence from amdgpu_fence_emit
Try to avoid using the hardware specific fences even more. 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 3e4ec56919c7..128eba604f97 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -429,7 +429,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
429 unsigned irq_type); 429 unsigned irq_type);
430void amdgpu_fence_driver_suspend(struct amdgpu_device *adev); 430void amdgpu_fence_driver_suspend(struct amdgpu_device *adev);
431void amdgpu_fence_driver_resume(struct amdgpu_device *adev); 431void amdgpu_fence_driver_resume(struct amdgpu_device *adev);
432int amdgpu_fence_emit(struct amdgpu_ring *ring, struct amdgpu_fence **fence); 432int amdgpu_fence_emit(struct amdgpu_ring *ring, struct fence **fence);
433void amdgpu_fence_process(struct amdgpu_ring *ring); 433void amdgpu_fence_process(struct amdgpu_ring *ring);
434int amdgpu_fence_wait_next(struct amdgpu_ring *ring); 434int amdgpu_fence_wait_next(struct amdgpu_ring *ring);
435int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); 435int amdgpu_fence_wait_empty(struct amdgpu_ring *ring);
@@ -766,7 +766,7 @@ struct amdgpu_ib {
766 uint32_t length_dw; 766 uint32_t length_dw;
767 uint64_t gpu_addr; 767 uint64_t gpu_addr;
768 uint32_t *ptr; 768 uint32_t *ptr;
769 struct amdgpu_fence *fence; 769 struct fence *fence;
770 struct amdgpu_user_fence *user; 770 struct amdgpu_user_fence *user;
771 struct amdgpu_vm *vm; 771 struct amdgpu_vm *vm;
772 unsigned vm_id; 772 unsigned vm_id;