diff options
author | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
---|---|---|
committer | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
commit | df7dcb58b58c58ac79aa14f17e92d744b8b13dd9 (patch) | |
tree | b439ba04547b3fd5c1b81c2a82269210b1c4523e /src/gallium/winsys/radeon/drm | |
parent | d58e3fa353c5df8028413837a366a16ff6054015 (diff) | |
parent | 5607823fe4ff35e11086efa6302d8fbacd315b06 (diff) |
Merge branch 'r300' into hhienvsa_r300
Diffstat (limited to 'src/gallium/winsys/radeon/drm')
-rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c index fa20d7eb98..a388e379b9 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c @@ -63,6 +63,25 @@ static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd, #define RADEON_BO_FLAGS_MICRO_TILE 2 #define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20 +#ifdef ANDROID + +extern void* __mmap2(void*, size_t, int, int, int, size_t); + +#define MMAP2_SHIFT 12 +static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd, unsigned long long offset) +{ + if ( offset & ((1UL << MMAP2_SHIFT)-1) ) { + errno = EINVAL; + return MAP_FAILED; + } + + return __mmap2(addr, size, prot, flags, fd, (size_t)(offset >> MMAP2_SHIFT)); +} + +#define mmap(addr, size, prot, flags, fd, offset) android_mmap2(addr, size, prot, flags, fd, offset) + +#endif /* ANDROID */ + extern const struct pb_vtbl radeon_bo_vtbl; |