Skip to content

Commit

Permalink
drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
Browse files Browse the repository at this point in the history
Fixes a regression introduced by d5c1e84
"drm/nouveau: hold mutex while syncing to kernel channel".

Cc: [email protected] #3.13
Reported-by: Fengguang Wu <[email protected]>
Signed-off-by: Maarten Lankhorst <[email protected]>
Signed-off-by: Ben Skeggs <[email protected]>
  • Loading branch information
Maarten Lankhorst authored and Ben Skeggs committed Jan 29, 2014
1 parent d83ef85 commit 09c3de1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nouveau_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
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)
Expand Down

0 comments on commit 09c3de1

Please sign in to comment.