Commit 16ae42fe authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: use common fence for amdgpu_vm_fence

Just cleanup the function parameters.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b56c2285
...@@ -2332,7 +2332,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, ...@@ -2332,7 +2332,7 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
struct fence *updates); struct fence *updates);
void amdgpu_vm_fence(struct amdgpu_device *adev, void amdgpu_vm_fence(struct amdgpu_device *adev,
struct amdgpu_vm *vm, struct amdgpu_vm *vm,
struct amdgpu_fence *fence); struct fence *fence);
uint64_t amdgpu_vm_map_gart(struct amdgpu_device *adev, uint64_t addr); uint64_t amdgpu_vm_map_gart(struct amdgpu_device *adev, uint64_t addr);
int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
struct amdgpu_vm *vm); struct amdgpu_vm *vm);
......
...@@ -216,7 +216,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, ...@@ -216,7 +216,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs,
} }
if (ib->vm) if (ib->vm)
amdgpu_vm_fence(adev, ib->vm, ib->fence); amdgpu_vm_fence(adev, ib->vm, &ib->fence->base);
amdgpu_ring_unlock_commit(ring); amdgpu_ring_unlock_commit(ring);
return 0; return 0;
......
...@@ -241,16 +241,16 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, ...@@ -241,16 +241,16 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring,
*/ */
void amdgpu_vm_fence(struct amdgpu_device *adev, void amdgpu_vm_fence(struct amdgpu_device *adev,
struct amdgpu_vm *vm, struct amdgpu_vm *vm,
struct amdgpu_fence *fence) struct fence *fence)
{ {
unsigned ridx = fence->ring->idx; struct amdgpu_ring *ring = amdgpu_ring_from_fence(fence);
unsigned vm_id = vm->ids[ridx].id; unsigned vm_id = vm->ids[ring->idx].id;
fence_put(adev->vm_manager.active[vm_id]); fence_put(adev->vm_manager.active[vm_id]);
adev->vm_manager.active[vm_id] = fence_get(&fence->base); adev->vm_manager.active[vm_id] = fence_get(fence);
fence_put(vm->ids[ridx].last_id_use); fence_put(vm->ids[ring->idx].last_id_use);
vm->ids[ridx].last_id_use = fence_get(&fence->base); vm->ids[ring->idx].last_id_use = fence_get(fence);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment