diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-11-09 11:50:05 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-11-10 11:51:11 +1000 |
| commit | 2b66b50b12cabc05f05543e792d4c9c2465d5702 (patch) | |
| tree | d56cc1a158d22e4485db7ceb96d108e0d9bef640 | |
| parent | b2298fd27127f872881048fd37cb9217a648ae06 (diff) | |
| download | op-kernel-dev-2b66b50b12cabc05f05543e792d4c9c2465d5702.zip op-kernel-dev-2b66b50b12cabc05f05543e792d4c9c2465d5702.tar.gz | |
drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
If ttm_bo_init() returns failure, it already destroyed the BO, so we need to
retry from scratch.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index d7ab914..8eb1834 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -102,6 +102,8 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, type = ttm_bo_type_device; } *bo_ptr = NULL; + +retry: bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; @@ -109,8 +111,6 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, bo->gobj = gobj; bo->surface_reg = -1; INIT_LIST_HEAD(&bo->list); - -retry: radeon_ttm_placement_from_domain(bo, domain); /* Kernel allocation are uninterruptible */ mutex_lock(&rdev->vram_mutex); |
