Mesa (master): trace: don't trace resource_destroy
Marek Olšák
mareko at kemper.freedesktop.org
Tue Apr 25 20:40:27 UTC 2017
Module: Mesa
Branch: master
Commit: 231dfa5a029f99d8bb2d4b0f34915bbc58458f93
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=231dfa5a029f99d8bb2d4b0f34915bbc58458f93
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Apr 16 20:09:03 2017 +0200
trace: don't trace resource_destroy
due to the lack of pipe_resource wrapping, we can get this call from inside
of driver calls, which would try to lock an already-locked mutex.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/gallium/drivers/trace/tr_screen.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 0fa8d0f449..e56434c5bd 100644
--- a/src/gallium/drivers/trace/tr_screen.c
+++ b/src/gallium/drivers/trace/tr_screen.c
@@ -391,13 +391,10 @@ trace_screen_resource_destroy(struct pipe_screen *_screen,
struct trace_screen *tr_scr = trace_screen(_screen);
struct pipe_screen *screen = tr_scr->screen;
- trace_dump_call_begin("pipe_screen", "resource_destroy");
-
- trace_dump_arg(ptr, screen);
- trace_dump_arg(ptr, resource);
-
- trace_dump_call_end();
-
+ /* Don't trace this, because due to the lack of pipe_resource wrapping,
+ * we can get this call from inside of driver calls, which would try
+ * to lock an already-locked mutex.
+ */
screen->resource_destroy(screen, resource);
}
More information about the mesa-commit
mailing list