diff options
| author |   Thomas Hellstrom <thellstrom@vmware.com> | 2014-03-31 10:20:30 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-04-03 09:31:37 +0200 |
| commit | c8e5e010ef12df6707a1d711a5279a22f67a355e (patch) | |
| tree | 10d6c6f066e2d7e8d00502f11f059bb80f4b6c52 /drivers/gpu/drm/vmwgfx | |
| parent | Merge branch 'primary-plane' of git://people.freedesktop.org/~robclark/linux into drm-next (diff) | |
| download | linux-dev-c8e5e010ef12df6707a1d711a5279a22f67a355e.tar.xz linux-dev-c8e5e010ef12df6707a1d711a5279a22f67a355e.zip | |
drm/vmwgfx: Fix query buffer locking order violation
The query buffers were reserved while holding the binding mutex, which
caused a circular locking dependency.
Cc: stable@vger.kernel.org
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c index 701d5207def6..8bb26dcd9eae 100644 --- 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(struct vmw_resource *res) (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; } |