This is a note to let you know that I've just added the patch titled
drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
to the 3.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-nouveau-fix-lock-unbalance-in-nouveau_crtc_page_flip.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 09c3de135063f93d7137ad112f551f293b1204cf Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
Date: Wed, 29 Jan 2014 11:05:09 +0100
Subject: drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
From: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
commit 09c3de135063f93d7137ad112f551f293b1204cf upstream.
Fixes a regression introduced by d5c1e84b3a130f0
"drm/nouveau: hold mutex while syncing to kernel channel".
Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxx>
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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)
Patches currently in stable-queue which might be from maarten.lankhorst@xxxxxxxxxxxxx are
queue-3.13/drm-nouveau-fix-m2mf-copy-to-tiled-gart.patch
queue-3.13/drm-nouveau-hold-mutex-while-syncing-to-kernel-channel.patch
queue-3.13/drm-nouveau-fix-lock-unbalance-in-nouveau_crtc_page_flip.patch
queue-3.13/drm-vmwgfx-fix-regression-caused-by-drm-ttm-make-ttm-reservation-calls-behave-like-reservation-calls.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html