mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 00:30:53 +07:00
drm/radeon: add error handling to radeon_vm_unbind_locked
Waiting for a fence can fail for different reasons, the most common is a deadlock. Signed-off-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
7ecc45e3ef
commit
35e56bd0a4
@ -316,10 +316,21 @@ static void radeon_vm_unbind_locked(struct radeon_device *rdev,
|
||||
}
|
||||
|
||||
/* wait for vm use to end */
|
||||
if (vm->fence) {
|
||||
radeon_fence_wait(vm->fence, false);
|
||||
radeon_fence_unref(&vm->fence);
|
||||
while (vm->fence) {
|
||||
int r;
|
||||
r = radeon_fence_wait(vm->fence, false);
|
||||
if (r)
|
||||
DRM_ERROR("error while waiting for fence: %d\n", r);
|
||||
if (r == -EDEADLK) {
|
||||
mutex_unlock(&rdev->vm_manager.lock);
|
||||
r = radeon_gpu_reset(rdev);
|
||||
mutex_lock(&rdev->vm_manager.lock);
|
||||
if (!r)
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
radeon_fence_unref(&vm->fence);
|
||||
|
||||
/* hw unbind */
|
||||
rdev->vm_manager.funcs->unbind(rdev, vm);
|
||||
|
Loading…
Reference in New Issue
Block a user