From d1c1ead7cd6ea8a9025703f519b09f0e0e8c673c Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Wed, 13 Feb 2019 11:51:50 -0800 Subject: [PATCH] iris/bufmgr: Add support for MMAP_OFFSET ioctl. Use the new DRM_IOCTL_I915_GEM_MMAP_OFFSET ioctl when available. [jordan.l.justen@intel.com: iris port] Signed-off-by: Jordan Justen v2: Update getparam check (Ken). Reviewed-by: Kenneth Graunke Reviewed-by: Jordan Justen Part-of: --- src/gallium/drivers/iris/iris_bufmgr.c | 52 +++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 9897acc971f..5bf52b32eeb 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -155,6 +155,7 @@ struct iris_bufmgr { struct util_vma_heap vma_allocator[IRIS_MEMZONE_COUNT]; bool has_llc:1; + bool has_mmap_offset:1; bool bo_reuse:1; struct gen_aux_map_context *aux_map_ctx; @@ -924,10 +925,46 @@ iris_bo_gem_mmap_legacy(struct pipe_debug_callback *dbg, return map; } +static void * +iris_bo_gem_mmap_offset(struct pipe_debug_callback *dbg, struct iris_bo *bo, + bool wc) +{ + struct iris_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 = gen_ioctl(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 = 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 * iris_bo_gem_mmap(struct pipe_debug_callback *dbg, struct iris_bo *bo, bool wc) { - return iris_bo_gem_mmap_legacy(dbg, bo, wc); + struct iris_bufmgr *bufmgr = bo->bufmgr; + + if (bufmgr->has_mmap_offset) + return iris_bo_gem_mmap_offset(dbg, bo, wc); + else + return iris_bo_gem_mmap_legacy(dbg, bo, wc); } static void * @@ -1633,6 +1670,18 @@ static struct gen_mapped_pinned_buffer_alloc aux_map_allocator = { .free = gen_aux_map_buffer_free, }; +static int +gem_param(int fd, int name) +{ + int v = -1; /* No param uses (yet) the sign bit, reserve it for errors */ + + struct drm_i915_getparam gp = { .param = name, .value = &v }; + if (gen_ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp)) + return -1; + + return v; +} + /** * Initializes the GEM buffer manager, which uses the kernel to allocate, map, * and manage map buffer objections. @@ -1673,6 +1722,7 @@ iris_bufmgr_create(struct gen_device_info *devinfo, int fd, bool bo_reuse) bufmgr->has_llc = devinfo->has_llc; bufmgr->bo_reuse = bo_reuse; + bufmgr->has_mmap_offset = gem_param(fd, I915_PARAM_MMAP_GTT_VERSION) >= 4; STATIC_ASSERT(IRIS_MEMZONE_SHADER_START == 0ull); const uint64_t _4GB = 1ull << 32; -- 2.30.2