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

intel_error_decode: Protect against missing ring registers

Browse Source 
A dodgy kernel may miss printing out the ring registers leading to a
FPE.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-01-23 21:50:36 +00:00
parent 4a9b70c326
commit b5109e62ce
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/intel_error_decode.c
View File

@ -309,15 +309,14 @@ print_fence(unsigned int devid, uint64_t fence)
#define MAX_RINGS 10 /* I really hope this never... */ #define MAX_RINGS 10 /* I really hope this never... */
uint32_t head[MAX_RINGS]; uint32_t head[MAX_RINGS];
int head_ndx = 0; int head_ndx = 0;
int num_rings = -1; int num_rings = 0;
static void print_batch(int is_batch, const char *ring_name, uint32_t gtt_offset) static void print_batch(int is_batch, const char *ring_name, uint32_t gtt_offset)
{ {
const char *buffer_type[2] = { "ringbuffer", "batchbuffer" }; const char *buffer_type[2] = { "ringbuffer", "batchbuffer" };
if (is_batch) { if (is_batch || !num_rings)
printf("%s (%s) at 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset); printf("%s (%s) at 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset);
} else { else
printf("%s (%s) at 0x%08x; HEAD points to: 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset, head[head_ndx++ % num_rings] + gtt_offset); printf("%s (%s) at 0x%08x; HEAD points to: 0x%08x\n", buffer_type[is_batch], ring_name, gtt_offset, head[head_ndx++ % num_rings] + gtt_offset);
}
} }
static void decode(struct drm_intel_decode *ctx, bool is_batch, static void decode(struct drm_intel_decode *ctx, bool is_batch,
@ -418,7 +417,7 @@ read_data_file(FILE *file)
matched = sscanf(line, " HEAD: 0x%08x\n", &reg); matched = sscanf(line, " HEAD: 0x%08x\n", &reg);
if (matched == 1) { if (matched == 1) {
head[head_ndx++] = print_head(reg); head[num_rings++] = print_head(reg);
} }
matched = sscanf(line, " ACTHD: 0x%08x\n", &reg); matched = sscanf(line, " ACTHD: 0x%08x\n", &reg);