geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau: use drm_mmap/drm_munmap wrappers 

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
main
Emil Velikov 2014-09-07 19:42:08 +01:00
parent dadc9eff9f
commit c98c54f843
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nouveau/nouveau.c
View File

@ -33,11 +33,11 @@
#include <stdbool.h> #include <stdbool.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86atomic.h> #include <xf86atomic.h>
#include "libdrm.h"
#include "libdrm_lists.h" #include "libdrm_lists.h"
#include "nouveau_drm.h" #include "nouveau_drm.h"
@ -381,7 +381,7 @@ nouveau_bo_del(struct nouveau_bo *bo)
drmIoctl(bo->device->fd, DRM_IOCTL_GEM_CLOSE, &req); drmIoctl(bo->device->fd, DRM_IOCTL_GEM_CLOSE, &req);
} }
if (bo->map) if (bo->map)
munmap(bo->map, bo->size); drm_munmap(bo->map, bo->size);
free(nvbo); free(nvbo);
} }
@ -607,7 +607,7 @@ nouveau_bo_map(struct nouveau_bo *bo, uint32_t access,
{ {
struct nouveau_bo_priv *nvbo = nouveau_bo(bo); struct nouveau_bo_priv *nvbo = nouveau_bo(bo);
if (bo->map == NULL) { if (bo->map == NULL) {
bo->map = mmap(0, bo->size, PROT_READ | PROT_WRITE, bo->map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
MAP_SHARED, bo->device->fd, nvbo->map_handle); MAP_SHARED, bo->device->fd, nvbo->map_handle);
if (bo->map == MAP_FAILED) { if (bo->map == MAP_FAILED) {
bo->map = NULL; bo->map = NULL;