flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-28 02:06:23 +00:00
Code Issues Releases Wiki Activity

aubdump: Handle 48 bit ppgtt dumping

Browse Source 
Put 48 bit block offsets in the AUB file and track the bo offsets with
uint64_t.

Signed-off-by: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
This commit is contained in:
Kristian Høgsberg Kristensen 2015-08-10 15:37:47 -07:00
parent 8a7c386f0a
commit 3156305ace
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/aubdump.c
View File

@ -58,7 +58,7 @@ static uint32_t device;
struct bo { struct bo {
uint32_t size; uint32_t size;
uint32_t offset; uint64_t offset;
void *map; void *map;
}; };
@ -115,6 +115,12 @@ align_u32(uint32_t v, uint32_t a)
return (v + a - 1) & ~(a - 1); return (v + a - 1) & ~(a - 1);
} }
static inline uint64_t
align_u64(uint64_t v, uint64_t a)
{
return (v + a - 1) & ~(a - 1);
}
static void static void
dword_out(uint32_t data) dword_out(uint32_t data)
{ {
@ -162,7 +168,7 @@ write_header(void)
* everything goes badly after that. * everything goes badly after that.
*/ */
static void static void
aub_write_trace_block(uint32_t type, void *virtual, uint32_t size, uint32_t gtt_offset) aub_write_trace_block(uint32_t type, void *virtual, uint32_t size, uint64_t gtt_offset)
{ {
uint32_t block_size; uint32_t block_size;
uint32_t subtype = 0; uint32_t subtype = 0;
@ -182,7 +188,7 @@ aub_write_trace_block(uint32_t type, void *virtual, uint32_t size, uint32_t gtt_
dword_out(gtt_offset + offset); dword_out(gtt_offset + offset);
dword_out(align_u32(block_size, 4)); dword_out(align_u32(block_size, 4));
if (gen >= 8) if (gen >= 8)
dword_out(0); dword_out((gtt_offset + offset) >> 32);
if (virtual) if (virtual)
data_out(GET_PTR(virtual) + offset, block_size); data_out(GET_PTR(virtual) + offset, block_size);
@ -195,7 +201,7 @@ aub_write_trace_block(uint32_t type, void *virtual, uint32_t size, uint32_t gtt_
} }
static void static void
aub_dump_ringbuffer(uint32_t batch_offset, uint32_t offset, int ring_flag) aub_dump_ringbuffer(uint64_t batch_offset, uint64_t offset, int ring_flag)
{ {
uint32_t ringbuffer[4096]; uint32_t ringbuffer[4096];
int ring = AUB_TRACE_TYPE_RING_PRB0; /* The default ring */ int ring = AUB_TRACE_TYPE_RING_PRB0; /* The default ring */
@ -211,7 +217,7 @@ aub_dump_ringbuffer(uint32_t batch_offset, uint32_t offset, int ring_flag)
if (gen >= 8) { if (gen >= 8) {
ringbuffer[ring_count++] = AUB_MI_BATCH_BUFFER_START | (3 - 2); ringbuffer[ring_count++] = AUB_MI_BATCH_BUFFER_START | (3 - 2);
ringbuffer[ring_count++] = batch_offset; ringbuffer[ring_count++] = batch_offset;
ringbuffer[ring_count++] = 0; ringbuffer[ring_count++] = batch_offset >> 32;
} else { } else {
ringbuffer[ring_count++] = AUB_MI_BATCH_BUFFER_START; ringbuffer[ring_count++] = AUB_MI_BATCH_BUFFER_START;
ringbuffer[ring_count++] = batch_offset; ringbuffer[ring_count++] = batch_offset;
@ -227,7 +233,7 @@ aub_dump_ringbuffer(uint32_t batch_offset, uint32_t offset, int ring_flag)
dword_out(offset); dword_out(offset);
dword_out(ring_count * 4); dword_out(ring_count * 4);
if (gen >= 8) if (gen >= 8)
dword_out(0); dword_out(offset >> 32);
data_out(ringbuffer, ring_count * 4); data_out(ringbuffer, ring_count * 4);
} }