From a6bdbd5c0f45816d622d5b9e94449b0b929afbb0 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Tue, 22 Dec 2020 21:23:36 +0200 Subject: [PATCH] freedreno: Fix FD_MESA_DEBUG=flush debug option fd_batch_check_size() should be after fd_batch_unlock_submit(), otherwise batch_flush() called from fd_batch_check_size() would wait on mutex forever. Fixes: 02298ed1 "freedreno: Add submit lock" Signed-off-by: Danylo Piliaiev Part-of: --- src/gallium/drivers/freedreno/freedreno_draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 7154719..c68bd33 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -334,8 +334,8 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info, if (fd_mesa_debug & FD_DBG_DDRAW) fd_context_all_dirty(ctx); - fd_batch_check_size(batch); fd_batch_unlock_submit(batch); + fd_batch_check_size(batch); fd_batch_reference(&batch, NULL); if (info == &new_info) @@ -451,8 +451,8 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, } } - fd_batch_check_size(batch); fd_batch_unlock_submit(batch); + fd_batch_check_size(batch); if (fallback) { fd_blitter_clear(pctx, buffers, color, depth, stencil); -- 2.7.4