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

radv: report the last GPUVM fault when a device lost is detected

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23238>
This commit is contained in:
Samuel Pitoiset
2023-10-10 10:44:00 +02:00
committed by Marge Bot
parent 5a6208ad72
commit 1febb6f762
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -694,7 +694,7 @@ radv_gpu_hang_occurred(struct radv_queue *queue, enum amd_ip_type ring)
return false;
}
static bool
bool
radv_vm_fault_occurred(struct radv_device *device, struct radv_winsys_gpuvm_fault_info *fault_info)
{
if (!device->physical_device->rad_info.has_gpuvm_fault_query)

2
src/amd/vulkan/radv_debug.h
View File

@@ -103,4 +103,6 @@ bool radv_trap_handler_init(struct radv_device *device);
void radv_trap_handler_finish(struct radv_device *device);
void radv_check_trap_handler(struct radv_queue *queue);
bool radv_vm_fault_occurred(struct radv_device *device, struct radv_winsys_gpuvm_fault_info *fault_info);
#endif

22
src/amd/vulkan/radv_device.c
View File

@@ -598,6 +598,17 @@ init_dispatch_tables(struct radv_device *device, struct radv_physical_device *ph
add_entrypoints(&b, &vk_common_device_entrypoints, RADV_DISPATCH_TABLE_COUNT);
}
static void
radv_report_gpuvm_fault(struct radv_device *device)
{
struct radv_winsys_gpuvm_fault_info fault_info = {0};
if (!radv_vm_fault_occurred(device, &fault_info))
return;
fprintf(stderr, "radv: GPUVM fault detected at address 0x%08" PRIx64 ".\n", fault_info.addr);
}
static VkResult
radv_check_status(struct vk_device *vk_device)
{
@@ -612,15 +623,20 @@ radv_check_status(struct vk_device *vk_device)
if (device->hw_ctx[i]) {
status = device->ws->ctx_query_reset_status(device->hw_ctx[i]);
if (status == RADV_GUILTY_CONTEXT_RESET)
if (status == RADV_GUILTY_CONTEXT_RESET) {
radv_report_gpuvm_fault(device);
return vk_device_set_lost(&device->vk, "GPU hung detected in this process");
else if (status == RADV_INNOCENT_CONTEXT_RESET)
} else if (status == RADV_INNOCENT_CONTEXT_RESET) {
context_reset = true;
}
}
}
if (context_reset)
if (context_reset) {
radv_report_gpuvm_fault(device);
return vk_device_set_lost(&device->vk, "GPU hung triggered by other process");
}
return VK_SUCCESS;
}