Commit 35e56bd0 authored by Christian König's avatar Christian König

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: default avatarChristian König <deathsimple@vodafone.de>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7ecc45e3
...@@ -316,10 +316,21 @@ static void radeon_vm_unbind_locked(struct radeon_device *rdev, ...@@ -316,10 +316,21 @@ static void radeon_vm_unbind_locked(struct radeon_device *rdev,
} }
/* wait for vm use to end */ /* wait for vm use to end */
if (vm->fence) { while (vm->fence) {
radeon_fence_wait(vm->fence, false); int r;
radeon_fence_unref(&vm->fence); 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 */ /* hw unbind */
rdev->vm_manager.funcs->unbind(rdev, vm); rdev->vm_manager.funcs->unbind(rdev, vm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment