lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/radeon: add error handling to radeon_vm_unbind_locked

Browse Source 
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:
Christian König
2012-06-25 15:13:50 +02:00
parent 7ecc45e3ef
commit 35e56bd0a4
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/radeon/radeon_gart.c
View File

@@ -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);