From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Christian_K=F6nig?= Subject: Re: [PATCH] drm/radeon: fix bo creation retry path Date: Fri, 13 Jul 2012 09:43:07 +0200 Message-ID: <4FFFD18B.2040600@vodafone.de> References: <1342131785-12373-1-git-send-email-j.glisse@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from outgoing.email.vodafone.de (outgoing.email.vodafone.de [139.7.28.128]) by gabe.freedesktop.org (Postfix) with ESMTP id AFC699E8C1 for ; Fri, 13 Jul 2012 00:43:11 -0700 (PDT) In-Reply-To: <1342131785-12373-1-git-send-email-j.glisse@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: j.glisse@gmail.com Cc: Jerome Glisse , stable@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On 13.07.2012 00:23, j.glisse@gmail.com wrote: > From: Jerome Glisse > > Retry label was at wrong place in function leading to memory > leak. > > Cc: > Signed-off-by: Jerome Glisse Reviewed-by: Christian K=F6nig > --- > drivers/gpu/drm/radeon/radeon_object.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/rad= eon/radeon_object.c > index 6ecb200..f71e472 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -138,7 +138,6 @@ int radeon_bo_create(struct radeon_device *rdev, > acc_size =3D ttm_bo_dma_acc_size(&rdev->mman.bdev, size, > sizeof(struct radeon_bo)); > = > -retry: > bo =3D kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); > if (bo =3D=3D NULL) > return -ENOMEM; > @@ -152,6 +151,8 @@ retry: > bo->surface_reg =3D -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);