[i-g-t,2/4] tools/intel_aubdump: Set addr_bits before write_header
diff mbox

Message ID 20171206231123.22380-2-scott.d.phillips@intel.com
State New
Headers show

Commit Message

Scott D Phillips Dec. 6, 2017, 11:11 p.m. UTC
write_header() uses addr_bits, so do the initialization earlier.
Also set the gen to a non-zero value in case of unknown device,
for use by a later patch.

Signed-off-by: Scott D Phillips <scott.d.phillips@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---
 tools/aubdump.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Patch
diff mbox

diff --git a/tools/aubdump.c b/tools/aubdump.c
index 6ba3cb66..5def6947 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -417,6 +417,15 @@  dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
 	}
 	if (gen == 0) {
 		gen = intel_gen(device);
+
+		/* If we don't know the device gen, then it probably is a
+		 * newer device. Set gen to some arbitrarily high number.
+		 */
+		if (gen == 0)
+			gen = 9999;
+
+		addr_bits = gen >= 8 ? 48 : 32;
+
 		write_header();
 
 		if (verbose)
@@ -425,11 +434,6 @@  dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
 			       filename, device, gen);
 	}
 
-	/* If we don't know the device gen, then it probably is a
-	 * newer device which uses 48-bit addresses.
-	 */
-	addr_bits = (gen >= 8 || gen == 0) ? 48 : 32;
-
 	if (verbose)
 		printf("Dumping execbuffer2:\n");