diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-09-11 16:10:02 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:42 -0400 |
| commit | d59f70216b7166f03fa732964deafc6453d62eb6 (patch) | |
| tree | 84d7f7d80a85de5a45e7bc3bf91a3dc850d8f1ee /drivers/gpu/drm/radeon/radeon_gem.c | |
| parent | d63dfed5e9aa5fbea25a471300ee1b33bdc710d0 (diff) | |
| download | blackbird-op-linux-d59f70216b7166f03fa732964deafc6453d62eb6.tar.gz blackbird-op-linux-d59f70216b7166f03fa732964deafc6453d62eb6.zip | |
drm/radeon: fix gem_close_object handling
Make the reserve non interruptible.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_gem.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_gem.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 6cac5cca3d81..cfad667ce785 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -134,13 +134,16 @@ void radeon_gem_object_close(struct drm_gem_object *obj, struct radeon_device *rdev = rbo->rdev; struct radeon_fpriv *fpriv = file_priv->driver_priv; struct radeon_vm *vm = &fpriv->vm; + int r; if (rdev->family < CHIP_CAYMAN) { return; } - if (radeon_bo_reserve(rbo, false)) { - dev_err(rdev->dev, "leaking bo va because we fail to reserve bo\n"); + r = radeon_bo_reserve(rbo, true); + if (r) { + dev_err(rdev->dev, "leaking bo va because " + "we fail to reserve bo (%d)\n", r); return; } radeon_vm_bo_rmv(rdev, vm, rbo); |
