fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/bufmgr: Add support for MMAP_OFFSET ioctl.

Browse source 
Use the new DRM_IOCTL_I915_GEM_MMAP_OFFSET ioctl when available.

v2: update getparam check (Ken).

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1675>
This commit is contained in:
Rafael Antognolli 2018-12-14 14:02:04 -08:00
parent 5bc3f52dd8
commit ae6f06c509
1 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/mesa/drivers/dri/i965/brw_bufmgr.c
View file

@ -156,6 +156,7 @@ struct brw_bufmgr {
bool has_llc:1; bool has_llc:1;
bool has_mmap_wc:1; bool has_mmap_wc:1;
bool has_mmap_offset:1;
bool bo_reuse:1; bool bo_reuse:1;
uint64_t initial_kflags; uint64_t initial_kflags;
@ -979,10 +980,45 @@ brw_bo_gem_mmap_legacy(struct brw_context *brw, struct brw_bo *bo, bool wc)
return map; return map;
} }
static void *
brw_bo_gem_mmap_offset(struct brw_context *brw, struct brw_bo *bo, bool wc)
{
struct brw_bufmgr *bufmgr = bo->bufmgr;
struct drm_i915_gem_mmap_offset mmap_arg = {
.handle = bo->gem_handle,
.flags = wc ? I915_MMAP_OFFSET_WC : I915_MMAP_OFFSET_WB,
};
/* Get the fake offset back */
int ret = drmIoctl(bufmgr->fd, DRM_IOCTL_I915_GEM_MMAP_OFFSET, &mmap_arg);
if (ret != 0) {
DBG("%s:%d: Error preparing buffer %d (%s): %s .\n",
__FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
return NULL;
}
/* And map it */
void *map = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
bufmgr->fd, mmap_arg.offset);
if (map == MAP_FAILED) {
DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
__FILE__, __LINE__, bo->gem_handle, bo->name, strerror(errno));
return NULL;
}
return map;
}
static void * static void *
brw_bo_gem_mmap(struct brw_context *brw, struct brw_bo *bo, bool wc) brw_bo_gem_mmap(struct brw_context *brw, struct brw_bo *bo, bool wc)
{ {
return brw_bo_gem_mmap_legacy(brw, bo, wc); struct brw_bufmgr *bufmgr = bo->bufmgr;
if (bufmgr->has_mmap_offset)
return brw_bo_gem_mmap_offset(brw, bo, wc);
else
return brw_bo_gem_mmap_legacy(brw, bo, wc);
} }
static void * static void *
@ -1730,6 +1766,7 @@ brw_bufmgr_create(struct gen_device_info *devinfo, int fd, bool bo_reuse)
bufmgr->has_llc = devinfo->has_llc; bufmgr->has_llc = devinfo->has_llc;
bufmgr->has_mmap_wc = gem_param(fd, I915_PARAM_MMAP_VERSION) > 0; bufmgr->has_mmap_wc = gem_param(fd, I915_PARAM_MMAP_VERSION) > 0;
bufmgr->bo_reuse = bo_reuse; bufmgr->bo_reuse = bo_reuse;
bufmgr->has_mmap_offset = gem_param(fd, I915_PARAM_MMAP_GTT_VERSION) >= 4;
const uint64_t _4GB = 4ull << 30; const uint64_t _4GB = 4ull << 30;