commit 8930e836429506249074f3757185378f0776ee67
author Rob Clark <robdclark@gmail.com> Tue Sep 11 18:04:57 2018
committer Rob Clark <robdclark@gmail.com> Thu Sep 27 19:29:45 2018
tree 677f6f920eb167d3ab764a0a68db452abad71779
parent ef6d15f8a86128251cb6320f7dcda0ee9e36d86a

freedreno: fix potential hang when destroying batch

batch_flush_reset_dependencies() expects to be called unlocked, and can
call fd_batch_reference() which can try to aquire the screen lock again.

Signed-off-by: Rob Clark <robdclark@gmail.com>

src/gallium/drivers/freedreno/freedreno_batch.c

diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index b3d1466..340756e 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -235,10 +235,10 @@
 	debug_assert(batch->resources->entries == 0);
 	_mesa_set_destroy(batch->resources, NULL);
 
+	fd_context_unlock(ctx);
 	batch_flush_reset_dependencies(batch, false);
 	debug_assert(batch->dependents_mask == 0);
 
-	fd_context_unlock(ctx);
 	util_copy_framebuffer_state(&batch->framebuffer, NULL);
 	batch_fini(batch);
 	free(batch);