Mesa (master): ddebug: dump driver state into a separate file

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ac0b60fa475278db78d937947b75e82a15a6d4bb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac0b60fa475278db78d937947b75e82a15a6d4bb

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Tue Feb 26 16:34:34 2019 +0100

ddebug: dump driver state into a separate file

Due to asynchronous execution, it's not clear which of the draws the state
may refer to.

This also works around an issue encountered with radeonsi where dumping
the driver state itself caused a hang.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/auxiliary/driver_ddebug/dd_draw.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/driver_ddebug/dd_draw.c b/src/gallium/auxiliary/driver_ddebug/dd_draw.c
index bda1891c49b..98e7a6bb99f 100644
--- a/src/gallium/auxiliary/driver_ddebug/dd_draw.c
+++ b/src/gallium/auxiliary/driver_ddebug/dd_draw.c
@@ -988,11 +988,6 @@ dd_report_hang(struct dd_context *dctx)
          dd_write_header(f, dscreen->screen, record->draw_state.base.apitrace_call_number);
          dd_write_record(f, record);
 
-         if (!encountered_hang) {
-            dd_dump_driver_state(dctx, f, PIPE_DUMP_DEVICE_STATUS_REGISTERS);
-            dd_dump_dmesg(f);
-         }
-
          fclose(f);
       }
 
@@ -1004,6 +999,18 @@ dd_report_hang(struct dd_context *dctx)
    if (num_later)
       fprintf(stderr, "... and %u additional draws.\n", num_later);
 
+   char name[512];
+   dd_get_debug_filename_and_mkdir(name, sizeof(name), false);
+   FILE *f = fopen(name, "w");
+   if (!f) {
+      fprintf(stderr, "fopen failed\n");
+   } else {
+      dd_write_header(f, dscreen->screen, 0);
+      dd_dump_driver_state(dctx, f, PIPE_DUMP_DEVICE_STATUS_REGISTERS);
+      dd_dump_dmesg(f);
+      fclose(f);
+   }
+
    fprintf(stderr, "\nDone.\n");
    dd_kill_process();
 }