summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2015-03-18 08:36:37 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2015-03-18 08:37:33 +0000
commit233808a58db1f62d773b03f9dad599924170aca6 (patch)
treed2803b35f7536b85d94c72ab185e582b3892245e
parenta172676488def584cfe8d0340c7e5ef4b7f81d74 (diff)
lib/batch: Trivial compile fix for 32-bit builds
intel_batchbuffer.c: In function 'fill_object': intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] obj->relocs_ptr = (uint64_t)relocs; ^ intel_batchbuffer.c: In function 'exec_blit': intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] exec.buffers_ptr = (uint64_t)objs; Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--lib/intel_batchbuffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 666c323d..c1c27a6d 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle,
memset(obj, 0, sizeof(*obj));
obj->handle = gem_handle;
obj->relocation_count = count;
- obj->relocs_ptr = (uint64_t)relocs;
+ obj->relocs_ptr = (uintptr_t)relocs;
}
static void exec_blit(int fd,
@@ -557,7 +557,7 @@ static void exec_blit(int fd,
{
struct drm_i915_gem_execbuffer2 exec;
- exec.buffers_ptr = (uint64_t)objs;
+ exec.buffers_ptr = (uintptr_t)objs;
exec.buffer_count = count;
exec.batch_start_offset = 0;
exec.batch_len = batch_len * 4;