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

intel_error_decode: Update address parsing for 64bit offsets

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-12-31 21:34:27 +00:00
parent 8f9df28a82
commit bb35716d25
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tools/intel_error_decode.c
View File

@ -438,7 +438,7 @@ print_fault_data(unsigned devid, uint32_t data1, uint32_t data0)
static void decode(struct drm_intel_decode *ctx, static void decode(struct drm_intel_decode *ctx,
const char *buffer_name, const char *buffer_name,
const char *ring_name, const char *ring_name,
uint32_t gtt_offset, uint64_t gtt_offset,
uint32_t head_offset, uint32_t head_offset,
uint32_t *data, uint32_t *data,
int *count) int *count)
@ -446,9 +446,13 @@ static void decode(struct drm_intel_decode *ctx,
if (!*count) if (!*count)
return; return;
printf("%s (%s) at 0x%08x", buffer_name, ring_name, gtt_offset); printf("%s (%s) at 0x%08x_%08x", buffer_name, ring_name,
(unsigned)(gtt_offset >> 32),
(unsigned)(gtt_offset & 0xffffffff));
if (head_offset != -1) if (head_offset != -1)
printf("; HEAD points to: 0x%08x", head_offset+ gtt_offset); printf("; HEAD points to: 0x%08x_%08x",
(unsigned)((head_offset + gtt_offset) >> 32),
(unsigned)((head_offset + gtt_offset) & 0xffffffff));
printf("\n"); printf("\n");
drm_intel_decode_set_batch_pointer(ctx, data, gtt_offset, *count); drm_intel_decode_set_batch_pointer(ctx, data, gtt_offset, *count);
@ -551,7 +555,7 @@ read_data_file(FILE *file)
char *line = NULL; char *line = NULL;
size_t line_size; size_t line_size;
uint32_t offset, value, ring_length = 0; uint32_t offset, value, ring_length = 0;
uint32_t gtt_offset = 0, new_gtt_offset; uint64_t gtt_offset = 0, new_gtt_offset;
uint32_t head_offset = -1; uint32_t head_offset = -1;
const char *buffer_name = "batch buffer"; const char *buffer_name = "batch buffer";
char *ring_name = NULL; char *ring_name = NULL;
@ -562,13 +566,20 @@ read_data_file(FILE *file)
dashes = strstr(line, "---"); dashes = strstr(line, "---");
if (dashes) { if (dashes) {
uint32_t lo, hi;
char *new_ring_name = malloc(dashes - line); char *new_ring_name = malloc(dashes - line);
strncpy(new_ring_name, line, dashes - line); strncpy(new_ring_name, line, dashes - line);
new_ring_name[dashes - line - 1] = '\0'; new_ring_name[dashes - line - 1] = '\0';
matched = sscanf(dashes, "--- gtt_offset = 0x%08x\n", matched = sscanf(dashes, "--- gtt_offset = 0x%08x %08x\n",
&new_gtt_offset); &hi, &lo);
if (matched == 1) { if (matched > 0) {
new_gtt_offset = hi;
if (matched == 2) {
new_gtt_offset <<= 32;
new_gtt_offset |= lo;
}
decode(decode_ctx, decode(decode_ctx,
buffer_name, ring_name, buffer_name, ring_name,
gtt_offset, head_offset, gtt_offset, head_offset,
@ -581,9 +592,15 @@ read_data_file(FILE *file)
continue; continue;
} }
matched = sscanf(dashes, "--- ringbuffer = 0x%08x\n", matched = sscanf(dashes, "--- ringbuffer = 0x%08x %08x\n",
&new_gtt_offset); &hi, &lo);
if (matched == 1) { if (matched > 0) {
new_gtt_offset = hi;
if (matched == 2) {
new_gtt_offset <<= 32;
new_gtt_offset |= lo;
}
decode(decode_ctx, decode(decode_ctx,
buffer_name, ring_name, buffer_name, ring_name,
gtt_offset, head_offset, gtt_offset, head_offset,
@ -599,9 +616,15 @@ read_data_file(FILE *file)
continue; continue;
} }
matched = sscanf(dashes, "--- HW Context = 0x%08x\n", matched = sscanf(dashes, "--- HW Context = 0x%08x %08x\n",
&new_gtt_offset); &hi, &lo);
if (matched == 1) { if (matched > 0) {
new_gtt_offset = hi;
if (matched == 2) {
new_gtt_offset <<= 32;
new_gtt_offset |= lo;
}
decode(decode_ctx, decode(decode_ctx,
buffer_name, ring_name, buffer_name, ring_name,
gtt_offset, head_offset, gtt_offset, head_offset,