diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-08 22:51:40 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-24 12:01:38 -0700 |
| commit | 7c9d69de5722fe492c3e06ec94d1c26013df2861 (patch) | |
| tree | 122140a2bdd53b8e14751b2c080b5c01298f5f9c /tools | |
| parent | 4279006ff24376c47ed3efff95ed2239b0928954 (diff) | |
intel_reg_dumper: Fix the i915 fence reg decode to not be pure lies.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/intel_reg_dumper.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c index 125434ba..9024f625 100644 --- a/tools/intel_reg_dumper.c +++ b/tools/intel_reg_dumper.c @@ -569,21 +569,23 @@ DEBUGSTRING(i830_debug_dspclk_gate_d) DEBUGSTRING(i810_debug_915_fence) { - char *enable = (val & 1) ? " enabled" : "disabled"; char format = (val & 1 << 12) ? 'Y' : 'X'; - int pitch = 1 << (((val & 0x70) >> 4) - 1); + int pitch = 128 << ((val & 0x70) >> 4); unsigned int offset = val & 0x0ff00000; - int size = (1024 * 1024) << (((val & 0x700) >> 8) - 1); + int size = (1024 * 1024) << ((val & 0x700) >> 8); if (IS_965(devid) || (IS_915(devid) && reg >= FENCE_NEW)) return; if (format == 'X') pitch *= 4; - - asprintf(result, "%s, %c tiled, %4d pitch, 0x%08x - 0x%08x (%dkb)", - enable, format, pitch, offset, offset + size, - size / 1024); + if (val & 1) { + asprintf(result, "enabled, %c tiled, %4d pitch, 0x%08x - 0x%08x (%dkb)", + format, pitch, offset, offset + size, + size / 1024); + } else { + asprintf(result, "disabled"); + } } DEBUGSTRING(i810_debug_965_fence_start) |