See the relevant kernel patch for the details. I guess this breaks
support for older error state, I am not actually sure. Without
versioning our error state though, I cannot think of a better way.
Suggestions are welcome.
Signed-off-by: Ben Widawsky <ben@xxxxxxxxxxxx>
---
tools/intel_error_decode.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c
index 1eeff07..d0028a1 100644
--- a/tools/intel_error_decode.c
+++ b/tools/intel_error_decode.c
@@ -311,17 +311,17 @@ print_fence(unsigned int devid, uint64_t fence)
uint32_t head[MAX_RINGS];
int head_ndx = 0;
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, uint64_t gtt_offset)
{
const char *buffer_type[2] = { "ringbuffer", "batchbuffer" };
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%016lx\n", buffer_type[is_batch], ring_name, gtt_offset);
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%016lx; HEAD points to: 0x%016lx\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,
- const char *ring_name, uint32_t gtt_offset, uint32_t *data,
+ const char *ring_name, uint64_t gtt_offset, uint32_t *data,
int *count)
{
if (!*count)
@@ -344,7 +344,7 @@ read_data_file(FILE *file)
char *line = NULL;
size_t line_size;
uint32_t offset, value, ring_length = 0;
- uint32_t gtt_offset = 0, new_gtt_offset;
+ uint64_t gtt_offset = 0, new_gtt_offset;
char *ring_name = NULL;
int is_batch = 1;
@@ -361,7 +361,7 @@ read_data_file(FILE *file)
if (num_rings == -1)
num_rings = head_ndx;
- matched = sscanf(dashes, "--- gtt_offset = 0x%08x\n",
+ matched = sscanf(dashes, "--- gtt_offset = 0x%016lx\n",
&new_gtt_offset);
if (matched == 1) {
decode(decode_ctx, is_batch, ring_name,
@@ -373,7 +373,7 @@ read_data_file(FILE *file)
continue;
}
- matched = sscanf(dashes, "--- ringbuffer = 0x%08x\n",
+ matched = sscanf(dashes, "--- ringbuffer = 0x%08lx\n",
&new_gtt_offset);
if (matched == 1) {
decode(decode_ctx, is_batch, ring_name,
--
1.9.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
