lkml.org 
[lkml]   [2014]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 091/120] drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

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

    From: Maarten Lankhorst <maarten.lankhorst@canonical.com>

    commit 09c3de135063f93d7137ad112f551f293b1204cf upstream.

    Fixes a regression introduced by d5c1e84b3a130f0
    "drm/nouveau: hold mutex while syncing to kernel channel".

    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/nouveau/nouveau_display.c
    +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
    @@ -618,7 +618,7 @@ nouveau_crtc_page_flip(struct drm_crtc *
    ret = nouveau_fence_sync(fence, chan);
    nouveau_fence_unref(&fence);
    if (ret)
    - goto fail_free;
    + goto fail_unpin;

    ret = ttm_bo_reserve(&old_bo->bo, true, false, false, NULL);
    if (ret)



    \
     
     \ /
      Last update: 2014-02-14 18:01    [W:4.083 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site