diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-08-07 17:18:41 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-08-10 14:09:23 +0200 |
| commit | 6d988ad4a21f25899936963e385e702002e4f18e (patch) | |
| tree | 7fbec7b516afb17dba009e05c8185d7627c4c033 | |
| parent | 3691ef55961aa0c5125d59463fa3fa5f4f61b170 (diff) | |
radv: report a better error message when QueueWaitIdle() failed
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/6230>
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 00df3a97dd6..799f291f0ae 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -4749,6 +4749,21 @@ VkResult radv_QueueSubmit( return VK_SUCCESS; } +static const char * +radv_get_queue_family_name(struct radv_queue *queue) +{ + switch (queue->queue_family_index) { + case RADV_QUEUE_GENERAL: + return "graphics"; + case RADV_QUEUE_COMPUTE: + return "compute"; + case RADV_QUEUE_TRANSFER: + return "transfer"; + default: + unreachable("Unknown queue family"); + } +} + VkResult radv_QueueWaitIdle( VkQueue _queue) { @@ -4762,8 +4777,11 @@ VkResult radv_QueueWaitIdle( if (!queue->device->ws->ctx_wait_idle(queue->hw_ctx, radv_queue_family_to_ring(queue->queue_family_index), - queue->queue_idx)) - return VK_ERROR_DEVICE_LOST; + queue->queue_idx)) { + return vk_errorf(queue->device->instance, VK_ERROR_DEVICE_LOST, + "Failed to wait for a '%s' queue to be idle. " + "GPU hang ?", radv_get_queue_family_name(queue)); + } return VK_SUCCESS; } |