diff options
| author | Christian König <christian.koenig@amd.com> | 2017-12-18 17:10:01 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-27 17:34:09 +0100 |
| commit | 0e36b9b2f99b17f2bfbf1d2dab1c2808f658d634 (patch) | |
| tree | 975788b917b5f1f41ca5b47797b618afd814f87f /drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | |
| parent | drm/amdgpu: rename vm_id to vmid (diff) | |
| download | linux-0e36b9b2f99b17f2bfbf1d2dab1c2808f658d634.tar.xz linux-0e36b9b2f99b17f2bfbf1d2dab1c2808f658d634.zip | |
drm/amdgpu: drop client_id from VM
Use the fence context from the scheduler entity.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c index d24884b419cb..16884a0b677b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c @@ -115,7 +115,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, flushed = id->flushed_updates; if ((amdgpu_vmid_had_gpu_reset(adev, id)) || - (atomic64_read(&id->owner) != vm->client_id) || + (atomic64_read(&id->owner) != vm->entity.fence_context) || (job->vm_pd_addr != id->pd_gpu_addr) || (updates && (!flushed || updates->context != flushed->context || dma_fence_is_later(updates, flushed))) || @@ -144,7 +144,7 @@ static int amdgpu_vmid_grab_reserved_locked(struct amdgpu_vm *vm, id->flushed_updates = dma_fence_get(updates); } id->pd_gpu_addr = job->vm_pd_addr; - atomic64_set(&id->owner, vm->client_id); + atomic64_set(&id->owner, vm->entity.fence_context); job->vm_needs_flush = needs_flush; if (needs_flush) { dma_fence_put(id->last_flush); @@ -242,7 +242,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, if (amdgpu_vmid_had_gpu_reset(adev, id)) continue; - if (atomic64_read(&id->owner) != vm->client_id) + if (atomic64_read(&id->owner) != vm->entity.fence_context) continue; if (job->vm_pd_addr != id->pd_gpu_addr) @@ -291,7 +291,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, id->pd_gpu_addr = job->vm_pd_addr; dma_fence_put(id->flushed_updates); id->flushed_updates = dma_fence_get(updates); - atomic64_set(&id->owner, vm->client_id); + atomic64_set(&id->owner, vm->entity.fence_context); needs_flush: job->vm_needs_flush = true; |