Module: Mesa
Branch: master
Commit: e3c942515884fa3c081b29ddf864f8756baaf2d2
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3c942515884fa3c081b29ddf864f8756baaf2d2
Author: Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl>
Date: Thu Sep 7 22:12:50 2017 +0200
radv: Actually check for vm faults.
The code can check for vm faults having happened. If we only do it
on a hang we don't know when the faults happened. This changes the
behavior to when the first VM faults is found, even without a hang.
Reviewed-by: Dave Airlie <airl...@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
src/amd/vulkan/radv_debug.c | 10 +++++++---
src/amd/vulkan/radv_debug.h | 1 +
src/amd/vulkan/radv_device.c | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index a1c0a61997..d52ba5d86d 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -88,11 +88,15 @@ radv_check_gpu_hangs(struct radv_queue *queue, struct
radeon_winsys_cs *cs)
struct radv_device *device = queue->device;
uint64_t addr;
- if (!radv_gpu_hang_occured(queue))
+ bool hang_occurred = radv_gpu_hang_occured(queue);
+ bool vm_fault_occurred = false;
+ if (queue->device->instance->debug_flags & RADV_DEBUG_VM_FAULTS)
+ vm_fault_occurred =
ac_vm_fault_occured(device->physical_device->rad_info.chip_class,
+
&device->dmesg_timestamp, &addr);
+ if (!hang_occurred && !vm_fault_occurred)
return;
- if (ac_vm_fault_occured(device->physical_device->rad_info.chip_class,
- &device->dmesg_timestamp, &addr)) {
+ if (vm_fault_occurred) {
fprintf(stderr, "VM fault report.\n\n");
fprintf(stderr, "Failing VM page: 0x%08"PRIx64"\n\n", addr);
}
diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 240ce16204..18ef7e7e0a 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -38,6 +38,7 @@ enum {
RADV_DEBUG_ALL_BOS = 0x100,
RADV_DEBUG_NO_IBS = 0x200,
RADV_DEBUG_DUMP_SPIRV = 0x400,
+ RADV_DEBUG_VM_FAULTS = 0x800,
};
enum {
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index d220eb596d..a68278ff43 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -411,6 +411,7 @@ static const struct debug_control radv_debug_options[] = {
{"allbos", RADV_DEBUG_ALL_BOS},
{"noibs", RADV_DEBUG_NO_IBS},
{"spirv", RADV_DEBUG_DUMP_SPIRV},
+ {"vmfaults", RADV_DEBUG_VM_FAULTS},
{NULL, 0}
};
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
