Module: Mesa Branch: master Commit: b3c8de1c55c5253add9ea46e8184f2c0d47b2ab1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3c8de1c55c5253add9ea46e8184f2c0d47b2ab1
Author: Samuel Pitoiset <[email protected]> Date: Mon Sep 11 16:12:15 2017 +0200 radv: save all descriptor pointers into the trace BO To dump them when a hang is detected. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> --- src/amd/vulkan/radv_cmd_buffer.c | 32 ++++++++++++++++++++++++++++++++ src/amd/vulkan/radv_debug.c | 3 +++ 2 files changed, 35 insertions(+) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 2f72b2bbce..068247d04d 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -422,6 +422,35 @@ radv_save_pipeline(struct radv_cmd_buffer *cmd_buffer, } static void +radv_save_descriptors(struct radv_cmd_buffer *cmd_buffer) +{ + struct radv_device *device = cmd_buffer->device; + struct radeon_winsys_cs *cs = cmd_buffer->cs; + uint32_t data[MAX_SETS * 2] = {}; + uint64_t va; + + if (!device->trace_bo) + return; + + va = device->ws->buffer_get_va(device->trace_bo) + 24; + + MAYBE_UNUSED unsigned cdw_max = radeon_check_space(device->ws, + cmd_buffer->cs, 4 + MAX_SETS * 2); + + for (int i = 0; i < MAX_SETS; i++) { + struct radv_descriptor_set *set = cmd_buffer->state.descriptors[i]; + if (!set) + continue; + + data[i * 2] = (uintptr_t)set; + data[i * 2 + 1] = (uintptr_t)set >> 32; + } + + device->ws->cs_add_buffer(cs, device->trace_bo, 8); + radv_emit_write_data_packet(cs, va, MAX_SETS * 2, data); +} + +static void radv_emit_graphics_blend_state(struct radv_cmd_buffer *cmd_buffer, struct radv_pipeline *pipeline) { @@ -1580,6 +1609,9 @@ radv_flush_descriptors(struct radv_cmd_buffer *cmd_buffer, } cmd_buffer->state.descriptors_dirty = 0; cmd_buffer->state.push_descriptors_dirty = false; + + radv_save_descriptors(cmd_buffer); + assert(cmd_buffer->cs->cdw <= cdw_max); } diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c index 733374cbb7..397a9ef421 100644 --- a/src/amd/vulkan/radv_debug.c +++ b/src/amd/vulkan/radv_debug.c @@ -48,6 +48,9 @@ * [1]: secondary trace ID * [2-3]: 64-bit GFX pipeline pointer * [4-5]: 64-bit COMPUTE pipeline pointer + * [6-7]: 64-bit descriptor set #0 pointer + * ... + * [68-69]: 64-bit descriptor set #31 pointer */ bool _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
