drm: use drm_mmap/drm_munmap wrappers
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>main
parent
4c2766b69c
commit
faf51d5694
|
@ -48,7 +48,6 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#define stat_t struct stat
|
#define stat_t struct stat
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/mman.h>
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
@ -58,6 +57,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
|
#include "libdrm.h"
|
||||||
|
|
||||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
||||||
#define DRM_MAJOR 145
|
#define DRM_MAJOR 145
|
||||||
|
@ -1137,7 +1137,7 @@ int drmMap(int fd, drm_handle_t handle, drmSize size, drmAddressPtr address)
|
||||||
|
|
||||||
size = (size + pagesize_mask) & ~pagesize_mask;
|
size = (size + pagesize_mask) & ~pagesize_mask;
|
||||||
|
|
||||||
*address = mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle);
|
*address = drm_mmap(0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, handle);
|
||||||
if (*address == MAP_FAILED)
|
if (*address == MAP_FAILED)
|
||||||
return -errno;
|
return -errno;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1157,7 +1157,7 @@ int drmMap(int fd, drm_handle_t handle, drmSize size, drmAddressPtr address)
|
||||||
*/
|
*/
|
||||||
int drmUnmap(drmAddress address, drmSize size)
|
int drmUnmap(drmAddress address, drmSize size)
|
||||||
{
|
{
|
||||||
return munmap(address, size);
|
return drm_munmap(address, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
drmBufInfoPtr drmGetBufInfo(int fd)
|
drmBufInfoPtr drmGetBufInfo(int fd)
|
||||||
|
@ -1264,7 +1264,7 @@ int drmUnmapBufs(drmBufMapPtr bufs)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < bufs->count; i++) {
|
for (i = 0; i < bufs->count; i++) {
|
||||||
munmap(bufs->list[i].address, bufs->list[i].total);
|
drm_munmap(bufs->list[i].address, bufs->list[i].total);
|
||||||
}
|
}
|
||||||
|
|
||||||
drmFree(bufs->list);
|
drmFree(bufs->list);
|
||||||
|
|
Loading…
Reference in New Issue