diff options
author | Jerome Glisse <jglisse@redhat.com> | 2012-07-12 18:23:05 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-07-25 00:11:01 -0400 |
commit | d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c (patch) | |
tree | 1cdd8275ae666fa4b4a8803f60633f485632e049 | |
parent | 949c4a34afacfe800fc442afac117aba15284962 (diff) |
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>
-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, | |||
136 | acc_size = ttm_bo_dma_acc_size(&rdev->mman.bdev, size, | 136 | acc_size = ttm_bo_dma_acc_size(&rdev->mman.bdev, size, |
137 | sizeof(struct radeon_bo)); | 137 | sizeof(struct radeon_bo)); |
138 | 138 | ||
139 | retry: | ||
140 | bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); | 139 | bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); |
141 | if (bo == NULL) | 140 | if (bo == NULL) |
142 | return -ENOMEM; | 141 | return -ENOMEM; |
@@ -150,6 +149,8 @@ retry: | |||
150 | bo->surface_reg = -1; | 149 | bo->surface_reg = -1; |
151 | INIT_LIST_HEAD(&bo->list); | 150 | INIT_LIST_HEAD(&bo->list); |
152 | INIT_LIST_HEAD(&bo->va); | 151 | INIT_LIST_HEAD(&bo->va); |
152 | |||
153 | retry: | ||
153 | radeon_ttm_placement_from_domain(bo, domain); | 154 | radeon_ttm_placement_from_domain(bo, domain); |
154 | /* Kernel allocation are uninterruptible */ | 155 | /* Kernel allocation are uninterruptible */ |
155 | down_read(&rdev->pm.mclk_lock); | 156 | down_read(&rdev->pm.mclk_lock); |