| From c8e5e010ef12df6707a1d711a5279a22f67a355e Mon Sep 17 00:00:00 2001 |
| From: Thomas Hellstrom <thellstrom@vmware.com> |
| Date: Mon, 31 Mar 2014 10:20:30 +0200 |
| Subject: drm/vmwgfx: Fix query buffer locking order violation |
| |
| From: Thomas Hellstrom <thellstrom@vmware.com> |
| |
| commit c8e5e010ef12df6707a1d711a5279a22f67a355e upstream. |
| |
| The query buffers were reserved while holding the binding mutex, which |
| caused a circular locking dependency. |
| |
| Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> |
| Reviewed-by: Brian Paul <brianp@vmware.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c |
| +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c |
| @@ -117,10 +117,10 @@ static void vmw_hw_context_destroy(struc |
| (void) vmw_context_binding_state_kill |
| (&container_of(res, struct vmw_user_context, res)->cbs); |
| (void) vmw_gb_context_destroy(res); |
| + mutex_unlock(&dev_priv->binding_mutex); |
| if (dev_priv->pinned_bo != NULL && |
| !dev_priv->query_cid_valid) |
| __vmw_execbuf_release_pinned_bo(dev_priv, NULL); |
| - mutex_unlock(&dev_priv->binding_mutex); |
| mutex_unlock(&dev_priv->cmdbuf_mutex); |
| return; |
| } |
