drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip

PATCH New Maarten Lankhorst 1 participant 1 message Jan 29, 2014

Subsystems (3)

DRM drivers DRM misc nouveau

lore

Share & tools

lore

Maarten Lankhorst

author

2014-01-29 10:05 UTC #0 lore raw

PATCH 1/1 drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip

Fixes a regression introduced by d5c1e84b3a130f0 "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]>

---

drivers/gpu/drm/nouveau/nouveau_display.c +1 -1

index b4262ad66b18..4d81c04b76c8 100644
@@ -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)