drm/amdgpu: use spin_lock_irqsave to protect vm_manager.pasid_idr

PhilipYangA · alexdeucher · commit 0a5f49cbf9d6 · 2019-02-05T18:10:24.000-05:00
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 &lt;Philip.Yang@amd.com&gt;
Reviewed-by: Christian König &lt;christian.koenig@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git 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,
 			 struct amdgpu_task_info *task_info)
 {
 	struct amdgpu_vm *vm;
+	unsigned long flags;
 
-	spin_lock(&adev->vm_manager.pasid_lock);
+	spin_lock_irqsave(&adev->vm_manager.pasid_lock, flags);
 
 	vm = idr_find(&adev->vm_manager.pasid_idr, pasid);
 	if (vm)
 		*task_info = vm->task_info;
 
-	spin_unlock(&adev->vm_manager.pasid_lock);
+	spin_unlock_irqrestore(&adev->vm_manager.pasid_lock, flags);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -3363,14 +3363,15 @@ void amdgpu_vm_get_task_info(struct amdgpu_device *adev, unsigned int pasid,`
`3363`	`3363`	`struct amdgpu_task_info *task_info)`
`3364`	`3364`	`{`
`3365`	`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`	`3370`	`vm = idr_find(&adev->vm_manager.pasid_idr, pasid);`
`3370`	`3371`	`if (vm)`
`3371`	`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`	`/**`