Module Name: xsrc
Committed By: tnn
Date: Sat Jan 19 11:50:05 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c
Log Message:
reduce diff to upstream
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_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.16 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.17
--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.16 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c Sat Jan 19 11:50:05 2019
@@ -1539,10 +1539,12 @@ map_gtt(drm_intel_bo *bo)
}
/* and mmap it */
- ret = drmMap(bufmgr_gem->fd, mmap_arg.offset, bo->size,
- &bo_gem->gtt_virtual);
- if (ret) {
+ bo_gem->gtt_virtual = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, bufmgr_gem->fd,
+ mmap_arg.offset);
+ if (bo_gem->gtt_virtual == MAP_FAILED) {
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,
Index: xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.8 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.9
--- xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.8 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c Sat Jan 19 11:50:05 2019
@@ -175,8 +175,8 @@ static int bo_map(struct radeon_bo_int *
boi, boi->handle, r);
return r;
}
- r = drmMap(boi->bom->fd, args.addr_ptr, args.size, &ptr);
- if (r)
+ ptr = drm_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi->bom->fd, args.addr_ptr);
+ if (ptr == MAP_FAILED)
return -errno;
bo_gem->priv_ptr = ptr;
wait:
