Mesa (master): winsys/radeon: use os_mmap() for memory mapping

Chia-I Wu olv at kemper.freedesktop.org
Tue Aug 23 19:58:20 PDT 2011


Module: Mesa
Branch: master
Commit: 70b1837dfb1b282ad9efcaeec4f9c8da5f9a74d8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=70b1837dfb1b282ad9efcaeec4f9c8da5f9a74d8

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sun Aug 21 12:31:45 2011 +0800

winsys/radeon: use os_mmap() for memory mapping

os_mmap() guarantees large file support across OSes.

Reviewed-by: Marek Olšák <maraeo at gmail.com>

---

 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index adfbefd..b45efe5 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -31,11 +31,11 @@
 #include "util/u_memory.h"
 #include "util/u_simple_list.h"
 #include "os/os_thread.h"
+#include "os/os_mman.h"
 
 #include "state_tracker/drm_driver.h"
 
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include <xf86drm.h>
 #include <errno.h>
 
@@ -160,7 +160,7 @@ static void radeon_bo_destroy(struct pb_buffer *_buf)
     }
 
     if (bo->ptr)
-        munmap(bo->ptr, bo->size);
+        os_munmap(bo->ptr, bo->size);
 
     /* Close object. */
     args.handle = bo->handle;
@@ -278,7 +278,7 @@ static void *radeon_bo_map_internal(struct pb_buffer *_buf,
         return NULL;
     }
 
-    ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED,
+    ptr = os_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED,
                bo->rws->fd, args.addr_ptr);
     if (ptr == MAP_FAILED) {
         pipe_mutex_unlock(bo->map_mutex);



More information about the mesa-commit mailing list