[Nouveau] [PATCH] drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip

Maarten Lankhorst maarten.lankhorst at canonical.com
Wed Jan 29 02:05:09 PST 2014


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

Cc: stable at vger.kernel.org #3.13
Reported-by: Fengguang Wu <fengguang.wu at intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
---
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)



More information about the Nouveau mailing list