diff options
| author | Chunming Zhou <[email protected]> | 2016-04-25 02:23:34 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2016-05-11 16:31:15 +0000 |
| commit | 1f207f81e371bed8aa4c898de091d5cfbf68f59e (patch) | |
| tree | 6acfb912d1b2a90ba7c10373f670c6d45b198b43 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
| parent | drm/amdgpu: add client id for every vm (diff) | |
| download | kernel-1f207f81e371bed8aa4c898de091d5cfbf68f59e.tar.gz kernel-1f207f81e371bed8aa4c898de091d5cfbf68f59e.zip | |
drm/amdgpu: make vmid owner be client_id
Using the pointer is not adequate.
Signed-off-by: Chunming Zhou <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Monk Liu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 275378c46b9f..2c3d9557e1a2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -185,7 +185,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, if (!id) continue; - if (atomic_long_read(&id->owner) != (long)vm) + if (atomic_long_read(&id->owner) != vm->client_id) continue; if (pd_addr != id->pd_gpu_addr) @@ -261,7 +261,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, list_move_tail(&id->list, &adev->vm_manager.ids_lru); id->last_user = ring; - atomic_long_set(&id->owner, (long)vm); + atomic_long_set(&id->owner, vm->client_id); vm->ids[ring->idx] = id; *vm_id = id - adev->vm_manager.ids; @@ -1485,7 +1485,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) list) { if (!id) continue; - if (atomic_long_read(&id->owner) == (long)vm) { + if (atomic_long_read(&id->owner) == vm->client_id) { atomic_long_set(&id->owner, 0); id->pd_gpu_addr = 0; } |