lkml.org 
[lkml]   [2013]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.5 12/90] drm/ttm: Fix ttm_bo_move_memcpy
    Date
    3.5.7.27 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Thomas Hellstrom <thellstrom@vmware.com>

    commit da95c788ef0c645378ffccb7060a0df1a33aee38 upstream.

    All error paths will want to keep the mm node, so handle this at the
    function exit. This fixes an ioremap failure error path.
    Also add some comments to make the function a bit easier to understand.

    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
    [ luis: backported to 3.5: adjusted context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/ttm/ttm_bo_util.c | 17 +++++++++++++++--
    1 file changed, 15 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
    index 2d69262..05577e8 100644
    --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
    +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
    @@ -337,12 +337,20 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
    if (ret)
    goto out;

    + /*
    + * Single TTM move. NOP.
    + */
    if (old_iomap == NULL && new_iomap == NULL)
    goto out2;
    +
    + /*
    + * Move nonexistent data. NOP.
    + */
    if (old_iomap == NULL && ttm == NULL)
    goto out2;

    - /* TTM might be null for moves within the same region.
    + /*
    + * TTM might be null for moves within the same region.
    */
    if (ttm && ttm->state == tt_unpopulated) {
    ret = ttm->bdev->driver->ttm_tt_populate(ttm);
    @@ -392,7 +400,12 @@ out1:
    ttm_mem_reg_iounmap(bdev, old_mem, new_iomap);
    out:
    ttm_mem_reg_iounmap(bdev, &old_copy, old_iomap);
    - ttm_bo_mem_put(bo, &old_copy);
    +
    + /*
    + * On error, keep the mm node!
    + */
    + if (!ret)
    + ttm_bo_mem_put(bo, &old_copy);
    return ret;
    }
    EXPORT_SYMBOL(ttm_bo_move_memcpy);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-05 20:01    [W:2.371 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site