From fd997bde2f94a4d1510ea0543779eadeaa7a4aba Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 22 Jun 2022 10:34:34 +0200 Subject: [PATCH] radv: dump UMR waves before UMR rings Dumping UMR rings might be slow and dumping waves before would make it more chance to dump them without reporting "No active waves". Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_debug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c index 138dad6f94d..67b46375b79 100644 --- a/src/amd/vulkan/radv_debug.c +++ b/src/amd/vulkan/radv_debug.c @@ -739,14 +739,6 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct radeon_cmdbuf *cs) } if (!(device->instance->debug_flags & RADV_DEBUG_NO_UMR)) { - /* Dump UMR ring. */ - snprintf(dump_path, sizeof(dump_path), "%s/%s", dump_dir, "umr_ring.log"); - f = fopen(dump_path, "w+"); - if (f) { - radv_dump_umr_ring(queue, f); - fclose(f); - } - /* Dump UMR waves. */ snprintf(dump_path, sizeof(dump_path), "%s/%s", dump_dir, "umr_waves.log"); f = fopen(dump_path, "w+"); @@ -754,6 +746,14 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct radeon_cmdbuf *cs) radv_dump_umr_waves(queue, f); fclose(f); } + + /* Dump UMR ring. */ + snprintf(dump_path, sizeof(dump_path), "%s/%s", dump_dir, "umr_ring.log"); + f = fopen(dump_path, "w+"); + if (f) { + radv_dump_umr_ring(queue, f); + fclose(f); + } } /* Dump debug registers. */