lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 058/109] drm/radeon: fix bo creation retry path
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.4-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Jerome Glisse <jglisse@redhat.com>

    commit d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c upstream.

    Retry label was at wrong place in function leading to memory
    leak.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/radeon_object.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- 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_devic
    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 */
    mutex_lock(&rdev->vram_mutex);

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-08-08 02:01    [W:4.292 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site