From: Emmanuel Date: Fri, 24 Jan 2020 22:48:06 +0000 (+0100) Subject: i965: Explicitly cast value to uint64_t X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f678811b567aafba60842bf0b3cff124da4daa0e;p=mesa.git i965: Explicitly cast value to uint64_t In FreeBSD x86 and aarch64 __u64 is typedef to unsigned long and is the same size as unsigned long long. Since we are explicitly specifying the format, cast the value to the proper type. Reviewed-by: Matt Turner Signed-off-by: Emmanuel Part-of: --- diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c index 3a08742d092..e48b0c3c1a1 100644 --- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c @@ -67,14 +67,14 @@ dump_validation_list(struct intel_batchbuffer *batch) uint64_t flags = batch->validation_list[i].flags; assert(batch->validation_list[i].handle == batch->exec_bos[i]->gem_handle); - fprintf(stderr, "[%2d]: %2d %-14s %p %s%-7s @ 0x%016llx%s (%"PRIu64"B)\n", + fprintf(stderr, "[%2d]: %2d %-14s %p %s%-7s @ 0x%"PRIx64"%s (%"PRIu64"B)\n", i, batch->validation_list[i].handle, batch->exec_bos[i]->name, batch->exec_bos[i], (flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) ? "(48b" : "(32b", (flags & EXEC_OBJECT_WRITE) ? " write)" : ")", - batch->validation_list[i].offset, + (uint64_t)batch->validation_list[i].offset, (flags & EXEC_OBJECT_PINNED) ? " (pinned)" : "", batch->exec_bos[i]->size); } @@ -740,9 +740,9 @@ execbuffer(int fd, /* Update brw_bo::gtt_offset */ if (batch->validation_list[i].offset != bo->gtt_offset) { - DBG("BO %d migrated: 0x%" PRIx64 " -> 0x%llx\n", + DBG("BO %d migrated: 0x%" PRIx64 " -> 0x%" PRIx64 "\n", bo->gem_handle, bo->gtt_offset, - batch->validation_list[i].offset); + (uint64_t)batch->validation_list[i].offset); assert(!(bo->kflags & EXEC_OBJECT_PINNED)); bo->gtt_offset = batch->validation_list[i].offset; }