summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@collabora.com>2019-02-13 09:31:37 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2019-02-13 14:10:51 +0000
commitc551087d967643b9983057a2bf0813205f433120 (patch)
tree50790b759d3457b0cc8479ff470a79e5ac5906f5
parente5eb456898c532b51edcb1715b57e7aa3799533d (diff)
i915/gem_ctx_sseu: Fix 32-bit build
This fixes a compiler warning treated as an error when building for 32-bit architectures since their pointer size does not match the size of drm_i915_gem_context_param.value which is 64 bits: CC i915/gem_ctx_sseu.o i915/gem_ctx_sseu.c: In function ‘test_ggtt_args’: i915/gem_ctx_sseu.c:384:9: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] munmap((void *)arg.value, 4096); It was found while building for arm with gcc 6.3.0 and I suspect the same problem would arise for i386 or other 32-bit architectures. The uintptr_t type is by definition an unsigned integer of the same length as a pointer on a given architecture, so this should fix the problem for all architectures up to 64 bits. Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--tests/i915/gem_ctx_sseu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/i915/gem_ctx_sseu.c b/tests/i915/gem_ctx_sseu.c
index 16609bee..3afa5c15 100644
--- a/tests/i915/gem_ctx_sseu.c
+++ b/tests/i915/gem_ctx_sseu.c
@@ -381,7 +381,7 @@ test_ggtt_args(int fd)
igt_assert_eq(__gem_context_get_param(fd, &arg), 0);
igt_assert_eq(__gem_context_set_param(fd, &arg), 0);
- munmap((void *)arg.value, 4096);
+ munmap((void *)(uintptr_t)arg.value, 4096);
gem_close(fd, bo);
gem_context_destroy(fd, arg.ctx_id);
}