aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-16 04:57:10 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:47 -0500
commit336d1f5efe93db3d997a6d105760dd613d7ecdce (patch)
tree15818ae465778ac8acaa1410c59042247f9800f4 /drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
parentbcc634f4a8f10a851dd3d8429ea28998351ca843 (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_fence.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 97db196dc6f8..d94b13ac290f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -91,25 +91,21 @@ static u32 amdgpu_fence_read(struct amdgpu_ring *ring)
91 * amdgpu_fence_emit - emit a fence on the requested ring 91 * amdgpu_fence_emit - emit a fence on the requested ring
92 * 92 *
93 * @ring: ring the fence is associated with 93 * @ring: ring the fence is associated with
94 * @owner: creator of the fence
95 * @fence: amdgpu fence object 94 * @fence: amdgpu fence object
96 * 95 *
97 * Emits a fence command on the requested ring (all asics). 96 * Emits a fence command on the requested ring (all asics).
98 * Returns 0 on success, -ENOMEM on failure. 97 * Returns 0 on success, -ENOMEM on failure.
99 */ 98 */
100int amdgpu_fence_emit(struct amdgpu_ring *ring, void *owner, 99int amdgpu_fence_emit(struct amdgpu_ring *ring, struct amdgpu_fence **fence)
101 struct amdgpu_fence **fence)
102{ 100{
103 struct amdgpu_device *adev = ring->adev; 101 struct amdgpu_device *adev = ring->adev;
104 102
105 /* we are protected by the ring emission mutex */
106 *fence = kmem_cache_alloc(amdgpu_fence_slab, GFP_KERNEL); 103 *fence = kmem_cache_alloc(amdgpu_fence_slab, GFP_KERNEL);
107 if ((*fence) == NULL) { 104 if ((*fence) == NULL) {
108 return -ENOMEM; 105 return -ENOMEM;
109 } 106 }
110 (*fence)->seq = ++ring->fence_drv.sync_seq; 107 (*fence)->seq = ++ring->fence_drv.sync_seq;
111 (*fence)->ring = ring; 108 (*fence)->ring = ring;
112 (*fence)->owner = owner;
113 fence_init(&(*fence)->base, &amdgpu_fence_ops, 109 fence_init(&(*fence)->base, &amdgpu_fence_ops,
114 &ring->fence_drv.fence_queue.lock, 110 &ring->fence_drv.fence_queue.lock,
115 adev->fence_context + ring->idx, 111 adev->fence_context + ring->idx,