OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: add RADV_DEBUG=noumr to disable UMR logs during GPU hang detection

Browse Source 
Sometimes UMR logs can't be dumped and you would get permission
denied, even if the UMR binary has the setuid bit enabled.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7706>
This commit is contained in:
Samuel Pitoiset
2020-11-20 09:56:59 +01:00
parent a61a398f7e
commit 4ffa6acb0d
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/amd/vulkan/radv_debug.c
View File

@@ -473,7 +473,8 @@ radv_dump_queue_state(struct radv_queue *queue, FILE *f)
pipeline = radv_get_saved_pipeline(queue->device, ring);
if (pipeline) {
radv_dump_shaders(pipeline, pipeline->active_stages, f);
radv_dump_annotated_shaders(pipeline, pipeline->active_stages, f);
if (!(queue->device->instance->debug_flags & RADV_DEBUG_NO_UMR))
radv_dump_annotated_shaders(pipeline, pipeline->active_stages, f);
radv_dump_descriptors(queue->device, f);
}
}
@@ -670,20 +671,22 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct radeon_cmdbuf *cs)
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);
}
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+");
if (f) {
radv_dump_umr_waves(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+");
if (f) {
radv_dump_umr_waves(queue, f);
fclose(f);
}
}
/* Dump debug registers. */