Commit 6a9eaabe authored by Emmanuel Vadot's avatar Emmanuel Vadot Committed by Eric Engestrom

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's avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: Emmanuel Vadot's avatarEmmanuel <manu@FreeBSD.org>
Part-of: <!3559>
(cherry picked from commit f678811b)
parent ab052fba
...@@ -2479,7 +2479,7 @@ ...@@ -2479,7 +2479,7 @@
"description": "i965: Explicitly cast value to uint64_t", "description": "i965: Explicitly cast value to uint64_t",
"nominated": false, "nominated": false,
"nomination_type": null, "nomination_type": null,
"resolution": 4, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": null "because_sha": null
}, },
......
...@@ -67,14 +67,14 @@ dump_validation_list(struct intel_batchbuffer *batch) ...@@ -67,14 +67,14 @@ dump_validation_list(struct intel_batchbuffer *batch)
uint64_t flags = batch->validation_list[i].flags; uint64_t flags = batch->validation_list[i].flags;
assert(batch->validation_list[i].handle == assert(batch->validation_list[i].handle ==
batch->exec_bos[i]->gem_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, i,
batch->validation_list[i].handle, batch->validation_list[i].handle,
batch->exec_bos[i]->name, batch->exec_bos[i]->name,
batch->exec_bos[i], batch->exec_bos[i],
(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) ? "(48b" : "(32b", (flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS) ? "(48b" : "(32b",
(flags & EXEC_OBJECT_WRITE) ? " write)" : ")", (flags & EXEC_OBJECT_WRITE) ? " write)" : ")",
batch->validation_list[i].offset, (uint64_t)batch->validation_list[i].offset,
(flags & EXEC_OBJECT_PINNED) ? " (pinned)" : "", (flags & EXEC_OBJECT_PINNED) ? " (pinned)" : "",
batch->exec_bos[i]->size); batch->exec_bos[i]->size);
} }
...@@ -729,9 +729,9 @@ execbuffer(int fd, ...@@ -729,9 +729,9 @@ execbuffer(int fd,
/* Update brw_bo::gtt_offset */ /* Update brw_bo::gtt_offset */
if (batch->validation_list[i].offset != 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, bo->gem_handle, bo->gtt_offset,
batch->validation_list[i].offset); (uint64_t)batch->validation_list[i].offset);
assert(!(bo->kflags & EXEC_OBJECT_PINNED)); assert(!(bo->kflags & EXEC_OBJECT_PINNED));
bo->gtt_offset = batch->validation_list[i].offset; bo->gtt_offset = batch->validation_list[i].offset;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment