diff options
author | Philip Yang <Philip.Yang@amd.com> | 2019-01-30 15:21:16 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-02-05 18:10:24 -0500 |
commit | 0a5f49cbf9d6ad3721c16f8a6d823363ea7a160f (patch) | |
tree | 9d30f4c625e164ab9402f0cb55dc0af1ee9f697c /drivers/gpu/drm/amd/amdgpu | |
parent | 7e4545d372b560df10fa47281ef0783a479ce435 (diff) |
drm/amdgpu: use spin_lock_irqsave to protect vm_manager.pasid_idr
amdgpu_vm_get_task_info is called from interrupt handler and sched timeout
workqueue, we should use irq version spin_lock to avoid deadlock.
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index d2ea5ce2cefb..7c108e687683 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |||
@@ -3363,14 +3363,15 @@ void amdgpu_vm_get_task_info(struct amdgpu_device *adev, unsigned int pasid, | |||
3363 | struct amdgpu_task_info *task_info) | 3363 | struct amdgpu_task_info *task_info) |
3364 | { | 3364 | { |
3365 | struct amdgpu_vm *vm; | 3365 | struct amdgpu_vm *vm; |
3366 | unsigned long flags; | ||
3366 | 3367 | ||
3367 | spin_lock(&adev->vm_manager.pasid_lock); | 3368 | spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags); |
3368 | 3369 | ||
3369 | vm = idr_find(&adev->vm_manager.pasid_idr, pasid); | 3370 | vm = idr_find(&adev->vm_manager.pasid_idr, pasid); |
3370 | if (vm) | 3371 | if (vm) |
3371 | *task_info = vm->task_info; | 3372 | *task_info = vm->task_info; |
3372 | 3373 | ||
3373 | spin_unlock(&adev->vm_manager.pasid_lock); | 3374 | spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags); |
3374 | } | 3375 | } |
3375 | 3376 | ||
3376 | /** | 3377 | /** |