Mesa (master): etnaviv: drm: Use mesa's os_m{un,}map

[GitLab Mirror]

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

Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri May 31 14:35:06 2019 +0200

etnaviv: drm: Use mesa's os_m{un,}map

Signed-off-by: Guido Günther <guido.gunther at puri.sm>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

---

 src/etnaviv/drm/etnaviv_bo.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/etnaviv/drm/etnaviv_bo.c b/src/etnaviv/drm/etnaviv_bo.c
index 31ad484da4f..abdd1817cce 100644
--- a/src/etnaviv/drm/etnaviv_bo.c
+++ b/src/etnaviv/drm/etnaviv_bo.c
@@ -24,6 +24,8 @@
  *    Christian Gmeiner <christian.gmeiner at gmail.com>
  */
 
+#include "os/os_mman.h"
+
 #include "etnaviv_priv.h"
 #include "etnaviv_drmif.h"
 
@@ -42,7 +44,7 @@ static void set_name(struct etna_bo *bo, uint32_t name)
 void bo_del(struct etna_bo *bo)
 {
 	if (bo->map)
-		drm_munmap(bo->map, bo->size);
+		os_munmap(bo->map, bo->size);
 
 	if (bo->name)
 		drmHashDelete(bo->dev->name_table, bo->name);
@@ -314,8 +316,8 @@ void *etna_bo_map(struct etna_bo *bo)
 			get_buffer_info(bo);
 		}
 
-		bo->map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
-				MAP_SHARED, bo->dev->fd, bo->offset);
+		bo->map = os_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+				  MAP_SHARED, bo->dev->fd, bo->offset);
 		if (bo->map == MAP_FAILED) {
 			ERROR_MSG("mmap failed: %s", strerror(errno));
 			bo->map = NULL;