From: Marek Olšák <marek.olsak@amd.com>
Date: Sun, 16 Apr 2017 18:09:03 +0000 (+0200)
Subject: trace: don't trace resource_destroy
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=231dfa5a029f99d8bb2d4b0f34915bbc58458f93;p=mesa.git

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@amd.com>
---

diff --git a/src/gallium/drivers/trace/tr_screen.c b/src/gallium/drivers/trace/tr_screen.c
index 0fa8d0f449f..e56434c5bda 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);
 }