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

tools/intel_error_decode: convert over to libdrm decoder

Browse Source 
Note that a per-ring error decode state would make more sense - this
way we could better decode the ring head and tail. But our current
head tracking is already lame (we need the kernel to also dump the
ringbuffer head/tail first, not just acthd), so I didn't bother.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-01-09 23:38:17 +01:00
parent 555cfd4597
commit 7ee9f16e51
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -47,11 +47,11 @@ AC_PROG_LIBTOOL
# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG # Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])]) [m4_fatal([must hate install xorg-macros 1.16 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.16) XORG_MACROS_VERSION(1.16)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23 libdrm]) PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.30 libdrm])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no]) PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])

29
tools/intel_error_decode.c
View File

@ -49,8 +49,8 @@
#include <errno.h> #include <errno.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <err.h> #include <err.h>
#include <intel_bufmgr.h>
#include "intel_decode.h"
#include "intel_chipset.h" #include "intel_chipset.h"
#include "intel_gpu_tools.h" #include "intel_gpu_tools.h"
#include "instdone.h" #include "instdone.h"
@ -276,7 +276,8 @@ print_fence(unsigned int devid, uint64_t fence)
static void static void
read_data_file (FILE *file) read_data_file (FILE *file)
{ {
int devid = PCI_CHIP_I855_GM; struct drm_intel_decode *decode_ctx = NULL;
uint32_t devid = PCI_CHIP_I855_GM;
uint32_t *data = NULL; uint32_t *data = NULL;
long long unsigned fence; long long unsigned fence;
int data_size = 0, count = 0, line_number = 0, matched; int data_size = 0, count = 0, line_number = 0, matched;
@ -306,7 +307,10 @@ read_data_file (FILE *file)
buffer_type[is_batch], buffer_type[is_batch],
ring_name, ring_name,
gtt_offset); gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); drm_intel_decode_set_batch_pointer(decode_ctx,
data, gtt_offset,
count);
drm_intel_decode(decode_ctx);
count = 0; count = 0;
} }
gtt_offset = new_gtt_offset; gtt_offset = new_gtt_offset;
@ -324,7 +328,10 @@ read_data_file (FILE *file)
buffer_type[is_batch], buffer_type[is_batch],
ring_name, ring_name,
gtt_offset); gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); drm_intel_decode_set_batch_pointer(decode_ctx,
data, gtt_offset,
count);
drm_intel_decode(decode_ctx);
count = 0; count = 0;
} }
gtt_offset = new_gtt_offset; gtt_offset = new_gtt_offset;
@ -345,7 +352,10 @@ read_data_file (FILE *file)
buffer_type[is_batch], buffer_type[is_batch],
ring_name, ring_name,
gtt_offset); gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); drm_intel_decode_set_batch_pointer(decode_ctx,
data, gtt_offset,
count);
drm_intel_decode(decode_ctx);
count = 0; count = 0;
} }
@ -356,11 +366,13 @@ read_data_file (FILE *file)
devid = reg; devid = reg;
printf("Detected GEN%i chipset\n", printf("Detected GEN%i chipset\n",
intel_gen(devid)); intel_gen(devid));
decode_ctx = drm_intel_decode_context_alloc(devid);
} }
matched = sscanf (line, " ACTHD: 0x%08x\n", &reg); matched = sscanf (line, " ACTHD: 0x%08x\n", &reg);
if (matched == 1) if (matched == 1)
intel_decode_context_set_head_tail(reg, 0xffffffff); drm_intel_decode_set_head_tail(decode_ctx, reg, 0xffffffff);
matched = sscanf (line, " PGTBL_ER: 0x%08x\n", &reg); matched = sscanf (line, " PGTBL_ER: 0x%08x\n", &reg);
if (matched == 1 && reg) if (matched == 1 && reg)
@ -400,7 +412,10 @@ read_data_file (FILE *file)
buffer_type[is_batch], buffer_type[is_batch],
ring_name, ring_name,
gtt_offset); gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); drm_intel_decode_set_batch_pointer(decode_ctx,
data, gtt_offset,
count);
drm_intel_decode(decode_ctx);
} }
free (data); free (data);