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_ib.c | |
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_ib.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 4e978e7aa1b8..9550247b030d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -101,7 +101,6 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) | |||
101 | * @adev: amdgpu_device pointer | 101 | * @adev: amdgpu_device pointer |
102 | * @num_ibs: number of IBs to schedule | 102 | * @num_ibs: number of IBs to schedule |
103 | * @ibs: IB objects to schedule | 103 | * @ibs: IB objects to schedule |
104 | * @owner: owner for creating the fences | ||
105 | * @f: fence created during this submission | 104 | * @f: fence created during this submission |
106 | * | 105 | * |
107 | * Schedule an IB on the associated ring (all asics). | 106 | * Schedule an IB on the associated ring (all asics). |
@@ -118,8 +117,7 @@ void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) | |||
118 | * to SI there was just a DE IB. | 117 | * to SI there was just a DE IB. |
119 | */ | 118 | */ |
120 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | 119 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, |
121 | struct amdgpu_ib *ibs, void *owner, | 120 | struct amdgpu_ib *ibs, struct fence *last_vm_update, |
122 | struct fence *last_vm_update, | ||
123 | struct fence **f) | 121 | struct fence **f) |
124 | { | 122 | { |
125 | struct amdgpu_device *adev = ring->adev; | 123 | struct amdgpu_device *adev = ring->adev; |
@@ -183,7 +181,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | |||
183 | amdgpu_ring_emit_hdp_invalidate(ring); | 181 | amdgpu_ring_emit_hdp_invalidate(ring); |
184 | } | 182 | } |
185 | 183 | ||
186 | r = amdgpu_fence_emit(ring, owner, &ib->fence); | 184 | r = amdgpu_fence_emit(ring, &ib->fence); |
187 | if (r) { | 185 | if (r) { |
188 | dev_err(adev->dev, "failed to emit fence (%d)\n", r); | 186 | dev_err(adev->dev, "failed to emit fence (%d)\n", r); |
189 | ring->current_ctx = old_ctx; | 187 | ring->current_ctx = old_ctx; |