Module Name: xsrc
Committed By: riastradh
Date: Fri Mar 21 18:11:21 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
Log Message:
Switch intel_bufmgr_gem to use drmMap instead of mmap directly.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
diff -u xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.6 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.7
--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.6 Mon Mar 17 07:52:19 2014
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c Fri Mar 21 18:11:21 2014
@@ -1271,12 +1271,10 @@ map_gtt(drm_intel_bo *bo)
}
/* and mmap it */
- bo_gem->gtt_virtual = mmap(0, bo->size, PROT_READ | PROT_WRITE,
- MAP_SHARED, bufmgr_gem->fd,
- mmap_arg.offset);
- if (bo_gem->gtt_virtual == MAP_FAILED) {
+ ret = drmMap(bufmgr_gem->fd, mmap_arg.offset, bo->size,
+ &bo_gem->gtt_virtual);
+ if (ret) {
bo_gem->gtt_virtual = NULL;
- ret = -errno;
DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
__FILE__, __LINE__,
bo_gem->gem_handle, bo_gem->name,
