diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-07 19:44:48 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-28 17:09:34 +0100 |
| commit | 84badffe5e1995eae6739267bdc3fd9ef7a55f32 (patch) | |
| tree | 477ea662139ab63a4e441d3d70a760fbe860fbc1 | |
| parent | 6281cf1b4310ff0b7670677cb4113a89ebf0b619 (diff) | |
freedreno: use drm_mmap/drm_munmap wrappers
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
| -rw-r--r-- | freedreno/freedreno_bo.c | 4 | ||||
| -rw-r--r-- | freedreno/freedreno_priv.h | 1 | ||||
| -rw-r--r-- | freedreno/kgsl/kgsl_bo.c | 2 | ||||
| -rw-r--r-- | freedreno/kgsl/kgsl_ringbuffer.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/freedreno/freedreno_bo.c b/freedreno/freedreno_bo.c index b90fc567..dacb34cc 100644 --- a/freedreno/freedreno_bo.c +++ b/freedreno/freedreno_bo.c @@ -312,7 +312,7 @@ out: static void bo_del(struct fd_bo *bo) { if (bo->map) - munmap(bo->map, bo->size); + drm_munmap(bo->map, bo->size); /* TODO probably bo's in bucket list get removed from * handle table?? @@ -394,7 +394,7 @@ drm_public void * fd_bo_map(struct fd_bo *bo) return NULL; } - bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, + bo->map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, bo->dev->fd, offset); if (bo->map == MAP_FAILED) { ERROR_MSG("mmap failed: %s", strerror(errno)); diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h index b204e534..8e072d96 100644 --- a/freedreno/freedreno_priv.h +++ b/freedreno/freedreno_priv.h @@ -40,7 +40,6 @@ #include <errno.h> #include <fcntl.h> #include <sys/ioctl.h> -#include <sys/mman.h> #include <pthread.h> #include <stdio.h> #include <assert.h> diff --git a/freedreno/kgsl/kgsl_bo.c b/freedreno/kgsl/kgsl_bo.c index c8680973..4e492dde 100644 --- a/freedreno/kgsl/kgsl_bo.c +++ b/freedreno/kgsl/kgsl_bo.c @@ -186,7 +186,7 @@ fd_bo_from_fbdev(struct fd_pipe *pipe, int fbfd, uint32_t size) * thinks the buffer hasn't be allocate and fails */ if (bo) { - void *fbmem = mmap(NULL, size, PROT_READ | PROT_WRITE, + void *fbmem = drm_mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fbfd, 0); struct kgsl_map_user_mem req = { .memtype = KGSL_USER_MEM_TYPE_ADDR, diff --git a/freedreno/kgsl/kgsl_ringbuffer.c b/freedreno/kgsl/kgsl_ringbuffer.c index dc3c9c25..da99741e 100644 --- a/freedreno/kgsl/kgsl_ringbuffer.c +++ b/freedreno/kgsl/kgsl_ringbuffer.c @@ -60,7 +60,7 @@ static void kgsl_rb_bo_del(struct kgsl_rb_bo *bo) }; int ret; - munmap(bo->hostptr, bo->size); + drm_munmap(bo->hostptr, bo->size); ret = ioctl(bo->pipe->fd, IOCTL_KGSL_SHAREDMEM_FREE, &req); if (ret) { @@ -93,7 +93,7 @@ static struct kgsl_rb_bo * kgsl_rb_bo_new(struct kgsl_pipe *pipe, uint32_t size) bo->pipe = pipe; bo->gpuaddr = req.gpuaddr; bo->size = size; - bo->hostptr = mmap(NULL, size, PROT_WRITE|PROT_READ, + bo->hostptr = drm_mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, pipe->fd, req.gpuaddr); return bo; |