diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2012-07-13 00:23:05 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-25 06:11:01 +0200 |
| commit | d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c (patch) | |
| tree | 1cdd8275ae666fa4b4a8803f60633f485632e049 /drivers/gpu/drm/radeon/radeon_object.c | |
| parent | drm: track dev_mapping in more robust and flexible way (diff) | |
| download | linux-d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c.tar.xz linux-d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c.zip | |
drm/radeon: fix bo creation retry path
Retry label was at wrong place in function leading to memory
leak.
Cc: <stable@vger.kernel.org>
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_object.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 1f77a5afc011..1f1a4c803c1d 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -136,7 +136,6 @@ int radeon_bo_create(struct radeon_device *rdev, acc_size = ttm_bo_dma_acc_size(&rdev->mman.bdev, size, sizeof(struct radeon_bo)); -retry: bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; @@ -150,6 +149,8 @@ retry: bo->surface_reg = -1; INIT_LIST_HEAD(&bo->list); INIT_LIST_HEAD(&bo->va); + +retry: radeon_ttm_placement_from_domain(bo, domain); /* Kernel allocation are uninterruptible */ down_read(&rdev->pm.mclk_lock); |