lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [132/223] drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>

    commit 2b66b50b12cabc05f05543e792d4c9c2465d5702 upstream.

    If ttm_bo_init() returns failure, it already destroyed the BO, so we need to
    retry from scratch.

    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
    Tested-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

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

    Index: linux/drivers/gpu/drm/radeon/radeon_object.c
    ===================================================================
    --- linux.orig/drivers/gpu/drm/radeon/radeon_object.c
    +++ linux/drivers/gpu/drm/radeon/radeon_object.c
    @@ -102,6 +102,8 @@ int radeon_bo_create(struct radeon_devic
    type = ttm_bo_type_device;
    }
    *bo_ptr = NULL;
    +
    +retry:
    bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
    if (bo == NULL)
    return -ENOMEM;
    @@ -109,8 +111,6 @@ int radeon_bo_create(struct radeon_devic
    bo->gobj = gobj;
    bo->surface_reg = -1;
    INIT_LIST_HEAD(&bo->list);
    -
    -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: 2010-12-13 01:13    [W:4.146 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site