lkml.org 
[lkml]   [2012]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 046/108] Revert "drm/radeon: fix bo creation retry path"
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

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

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

    From: Alex Deucher <alexander.deucher@amd.com>

    commit 676bc2e1e4f9072f7a640d5b7c99ffdf9709a6e7 upstream.

    This reverts commit d1c7871ddb1f588b8eb35affd9ee1a3d5e11cd0c.

    ttm_bo_init() destroys the BO on failure. So this patch makes
    the retry path work with freed memory. This ends up causing
    kernel panics when this path is hit.

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/drivers/gpu/drm/radeon/radeon_object.c
    +++ b/drivers/gpu/drm/radeon/radeon_object.c
    @@ -138,6 +138,7 @@ 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;
    @@ -151,8 +152,6 @@ int radeon_bo_create(struct radeon_devic
    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);



    \
     
     \ /
      Last update: 2012-09-13 02:41    [W:0.025 / U:0.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site