From 35691edea0cccf3d0c270e5eff816f03a957a3ec Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 27 May 2021 08:38:34 -0400 Subject: [PATCH] aux/trace: avoid deadlock in screen::flush_frontbuffer hook this hook usually requires mapping a resource, which will trigger a trace dump internally, which requires locking the output mutex, so finish the trace dump before calling it Acked-by: Alyssa Rosenzweig Part-of: --- src/gallium/auxiliary/driver_trace/tr_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index 41594819420..b8517606fb8 100644 --- a/src/gallium/auxiliary/driver_trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c @@ -409,9 +409,9 @@ trace_screen_flush_frontbuffer(struct pipe_screen *_screen, trace_dump_arg(ptr, context_private); */ - screen->flush_frontbuffer(screen, pipe, resource, level, layer, context_private, sub_box); - trace_dump_call_end(); + + screen->flush_frontbuffer(screen, pipe, resource, level, layer, context_private, sub_box); }