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

radv: save all descriptor pointers into the trace BO

Browse Source 
To dump them when a hang is detected.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2017-09-11 16:12:15 +02:00
parent d7f2430703
commit b3c8de1c55
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -421,6 +421,35 @@ radv_save_pipeline(struct radv_cmd_buffer *cmd_buffer,
radv_emit_write_data_packet(cs, va, 2, data); radv_emit_write_data_packet(cs, va, 2, data);
} }
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 static void
radv_emit_graphics_blend_state(struct radv_cmd_buffer *cmd_buffer, radv_emit_graphics_blend_state(struct radv_cmd_buffer *cmd_buffer,
struct radv_pipeline *pipeline) 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.descriptors_dirty = 0;
cmd_buffer->state.push_descriptors_dirty = false; cmd_buffer->state.push_descriptors_dirty = false;
radv_save_descriptors(cmd_buffer);
assert(cmd_buffer->cs->cdw <= cdw_max); assert(cmd_buffer->cs->cdw <= cdw_max);
} }

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

@@ -48,6 +48,9 @@
* [1]: secondary trace ID * [1]: secondary trace ID
* [2-3]: 64-bit GFX pipeline pointer * [2-3]: 64-bit GFX pipeline pointer
* [4-5]: 64-bit COMPUTE 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 bool