lkml.org 
[lkml]   [2013]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 098/173] drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Skeggs <bskeggs@redhat.com>

    commit 9360bd1112d8874d21942e2ae74f5416b00a8db6 upstream.

    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/drivers/gpu/drm/nouveau/nouveau_gem.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
    @@ -287,7 +287,8 @@ validate_fini_list(struct list_head *lis
    list_for_each_safe(entry, tmp, list) {
    nvbo = list_entry(entry, struct nouveau_bo, entry);

    - nouveau_bo_fence(nvbo, fence);
    + if (likely(fence))
    + nouveau_bo_fence(nvbo, fence);

    if (unlikely(nvbo->validate_mapped)) {
    ttm_bo_kunmap(&nvbo->kmap);



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