summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-16 17:39:39 +0100
committerAlex Deucher <alexander.deucher@amd.com>2016-03-08 11:01:48 -0500
commit364beb2cc45247e980a097e53d0932e143873333 (patch)
tree01aa4a62683d8d35a5c7908b1774e02bbb62dcf3 /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
parent257bf15a4b9795f8b352beb6e72a7e3e5aab8d27 (diff)
downloadop-kernel-dev-364beb2cc45247e980a097e53d0932e143873333.zip
op-kernel-dev-364beb2cc45247e980a097e53d0932e143873333.tar.gz
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_ib.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 9550247..979c445 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -90,9 +90,8 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
*/
void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)
{
- amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base);
- if (ib->fence)
- fence_put(&ib->fence->base);
+ amdgpu_sa_bo_free(adev, &ib->sa_bo, ib->fence);
+ fence_put(ib->fence);
}
/**
@@ -198,7 +197,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
}
if (f)
- *f = fence_get(&ib->fence->base);
+ *f = fence_get(ib->fence);
amdgpu_ring_commit(ring);
return 0;
OpenPOWER on IntegriCloud