diff mbox

drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip

Message ID 52E8D255.6020806@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maarten Lankhorst Jan. 29, 2014, 10:05 a.m. UTC 
Fixes a regression introduced by d5c1e84b3a130f0
"drm/nouveau: hold mutex while syncing to kernel channel".

Cc: stable@vger.kernel.org #3.13
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
---
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index b4262ad66b18..4d81c04b76c8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -642,7 +642,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)