[Intel-gfx] [PATCH i-g-t] tools/aubdump: Fix ISO C90 forbids mixed declarations and code warning

Tvrtko Ursulin tursulin at ursulin.net
Mon Apr 9 16:35:39 UTC 2018


From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Back to a clean build with no warnings, at least for me.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: Scott D Phillips <scott.d.phillips at intel.com>
---
 tools/aubdump.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/aubdump.c b/tools/aubdump.c
index 267061b0fc2b..2d2b6c607a43 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -394,10 +394,11 @@ gen8_emit_ggtt_pte_for_range(uint64_t start, uint64_t end)
 
 	entry_addr = start & ~(4096 - 1);
 	do {
+		uint64_t last_page_entry, num_entries;
+
 		page_num = entry_addr >> 21;
-		uint64_t last_page_entry =
-			min((page_num + 1) << 21, end_aligned);
-		uint64_t num_entries = (last_page_entry - entry_addr) >> 12;
+		last_page_entry = min((page_num + 1) << 21, end_aligned);
+		num_entries = (last_page_entry - entry_addr) >> 12;
 		mem_trace_memory_write_header_out(
 			entry_addr >> 9, num_entries * GEN8_PTE_SIZE,
 			AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_GGTT_ENTRY);
-- 
2.14.1



More information about the Intel-gfx mailing list