* [PATCH] drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
@ 2014-05-01 11:58 Maarten Lankhorst
2014-05-01 12:20 ` Maarten Lankhorst
0 siblings, 1 reply; 2+ messages in thread
From: Maarten Lankhorst @ 2014-05-01 11:58 UTC (permalink / raw)
To: dri-devel@lists.freedesktop.org, Ben Skeggs
Fixes a regression introduced by 060810d7abaabca "drm/nouveau: fix locking issues in page flipping paths".
chan->cli->mutex is unlocked a second time in the fail_unreserve path, fix this by moving mutex_unlock down.
Cc: stable@vger.kernel.org # v3.11+
---
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 24011596af43..5524a3705224 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -762,9 +762,9 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
}
ret = nouveau_page_flip_emit(chan, old_bo, new_bo, s, &fence);
- mutex_unlock(&chan->cli->mutex);
if (ret)
goto fail_unreserve;
+ mutex_unlock(&chan->cli->mutex);
/* Update the crtc struct and cleanup */
crtc->fb = fb;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip
2014-05-01 11:58 [PATCH] drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip Maarten Lankhorst
@ 2014-05-01 12:20 ` Maarten Lankhorst
0 siblings, 0 replies; 2+ messages in thread
From: Maarten Lankhorst @ 2014-05-01 12:20 UTC (permalink / raw)
To: dri-devel@lists.freedesktop.org, Ben Skeggs
op 01-05-14 13:58, Maarten Lankhorst schreef:
> Fixes a regression introduced by 060810d7abaabca "drm/nouveau: fix locking issues in page flipping paths".
> chan->cli->mutex is unlocked a second time in the fail_unreserve path, fix this by moving mutex_unlock down.
>
> Cc: stable@vger.kernel.org # v3.11+
> ---
> diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
> index 24011596af43..5524a3705224 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_display.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_display.c
> @@ -762,9 +762,9 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
> }
>
> ret = nouveau_page_flip_emit(chan, old_bo, new_bo, s, &fence);
> - mutex_unlock(&chan->cli->mutex);
> if (ret)
> goto fail_unreserve;
> + mutex_unlock(&chan->cli->mutex);
>
> /* Update the crtc struct and cleanup */
> crtc->fb = fb;
>
I had a feeling I missed something here..
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-01 12:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-01 11:58 [PATCH] drm/nouveau: fix another lock unbalance in nouveau_crtc_page_flip Maarten Lankhorst
2014-05-01 12:20 ` Maarten Lankhorst
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.