lkml.org 
[lkml]   [2011]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 067/209] drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
    Date
    From: Francisco Jerez <currojerez@riseup.net>

    =====================================================================
    | This is a commit scheduled for the next v2.6.34 longterm release. |
    | If you see a problem with using this for longterm, please comment.|
    =====================================================================

    commit 0fbecd400dd0a82d465b3086f209681e8c54cb0f upstream.

    It makes sense for a BO to move after a process has requested
    exclusive RW access on it (e.g. because the BO used to be located in
    unmappable VRAM and we intercepted the CPU access from the fault
    handler).

    If we let the ghost object inherit cpu_writers from the original
    object, ttm_bo_release_list() will raise a kernel BUG when the ghost
    object is destroyed. This can be reproduced with the nouveau driver on
    nv5x.

    Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Signed-off-by: Francisco Jerez <currojerez@riseup.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/gpu/drm/ttm/ttm_bo_util.c | 1 +
    1 files changed, 1 insertions(+), 0 deletions(-)

    diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
    index d764e82..fe04f8c 100644
    --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
    +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
    @@ -327,6 +327,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
    INIT_LIST_HEAD(&fbo->lru);
    INIT_LIST_HEAD(&fbo->swap);
    fbo->vm_node = NULL;
    + atomic_set(&fbo->cpu_writers, 0);

    fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);
    if (fbo->mem.mm_node)
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-04-14 20:03    [W:0.028 / U:30.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site