Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8e5e010 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

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: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
parent 2844ea3f

drivers/gpu/drm/vmwgfx/vmwgfx_context.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}