diff options
author | Christian König <christian.koenig@amd.com> | 2016-02-16 04:57:10 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-03-08 11:01:47 -0500 |
commit | 336d1f5efe93db3d997a6d105760dd613d7ecdce (patch) | |
tree | 15818ae465778ac8acaa1410c59042247f9800f4 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | bcc634f4a8f10a851dd3d8429ea28998351ca843 (diff) |
drm/amdgpu: remove HW fence owner
Not used any more since we now always use the sheduler.
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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 11a9f5899995..fab6ddb26b5b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -409,9 +409,6 @@ struct amdgpu_fence { | |||
409 | struct amdgpu_ring *ring; | 409 | struct amdgpu_ring *ring; |
410 | uint64_t seq; | 410 | uint64_t seq; |
411 | 411 | ||
412 | /* filp or special value for fence creator */ | ||
413 | void *owner; | ||
414 | |||
415 | wait_queue_t fence_wake; | 412 | wait_queue_t fence_wake; |
416 | }; | 413 | }; |
417 | 414 | ||
@@ -432,8 +429,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, | |||
432 | unsigned irq_type); | 429 | unsigned irq_type); |
433 | void amdgpu_fence_driver_suspend(struct amdgpu_device *adev); | 430 | void amdgpu_fence_driver_suspend(struct amdgpu_device *adev); |
434 | void amdgpu_fence_driver_resume(struct amdgpu_device *adev); | 431 | void amdgpu_fence_driver_resume(struct amdgpu_device *adev); |
435 | int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner, | 432 | int amdgpu_fence_emit(struct amdgpu_ring *ring, struct amdgpu_fence **fence); |
436 | struct amdgpu_fence **fence); | ||
437 | void amdgpu_fence_process(struct amdgpu_ring *ring); | 433 | void amdgpu_fence_process(struct amdgpu_ring *ring); |
438 | int amdgpu_fence_wait_next(struct amdgpu_ring *ring); | 434 | int amdgpu_fence_wait_next(struct amdgpu_ring *ring); |
439 | int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); | 435 | int amdgpu_fence_wait_empty(struct amdgpu_ring *ring); |
@@ -1177,8 +1173,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, | |||
1177 | unsigned size, struct amdgpu_ib *ib); | 1173 | unsigned size, struct amdgpu_ib *ib); |
1178 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib); | 1174 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib); |
1179 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | 1175 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, |
1180 | struct amdgpu_ib *ib, void *owner, | 1176 | struct amdgpu_ib *ib, struct fence *last_vm_update, |
1181 | struct fence *last_vm_update, | ||
1182 | struct fence **f); | 1177 | struct fence **f); |
1183 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); | 1178 | int amdgpu_ib_pool_init(struct amdgpu_device *adev); |
1184 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); | 1179 | void amdgpu_ib_pool_fini(struct amdgpu_device *adev); |