From 527cad1618b458a2ff04b1d63ea1ffe926774815 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 10 Jan 2012 18:41:46 +0100 Subject: lib/drmtest: extract gem_mmap Signed-Off-by: Daniel Vetter --- tests/gen3_render_tiledx_blits.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'tests/gen3_render_tiledx_blits.c') diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c index e34d2f77..ce1ed3e0 100644 --- a/tests/gen3_render_tiledx_blits.c +++ b/tests/gen3_render_tiledx_blits.c @@ -304,26 +304,6 @@ copy(int fd, uint32_t dst, uint32_t src) gem_close(fd, handle); } -static void *gem_mmap(int fd, uint32_t handle, int size, int prot) -{ - struct drm_i915_gem_mmap_gtt mmap_arg; - void *ptr; - - mmap_arg.handle = handle; - if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &mmap_arg)) { - assert(0); - return NULL; - } - - ptr = mmap(0, size, prot, MAP_SHARED, fd, mmap_arg.offset); - if (ptr == MAP_FAILED) { - assert(0); - ptr = NULL; - } - - return ptr; -} - static uint32_t create_bo(int fd, uint32_t val) { @@ -336,6 +316,7 @@ create_bo(int fd, uint32_t val) /* Fill the BO with dwords starting at val */ v = gem_mmap(fd, handle, WIDTH*HEIGHT*4, PROT_READ | PROT_WRITE); + assert(v); for (i = 0; i < WIDTH*HEIGHT; i++) v[i] = val++; munmap(v, WIDTH*HEIGHT*4); @@ -350,6 +331,7 @@ check_bo(int fd, uint32_t handle, uint32_t val) int i; v = gem_mmap(fd, handle, WIDTH*HEIGHT*4, PROT_READ); + assert(v); for (i = 0; i < WIDTH*HEIGHT; i++) { if (v[i] != val) { fprintf(stderr, "Expected 0x%08x, found 0x%08x " -- cgit v1.2.3