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

anv: add ability to mmap at offset

Browse source 
Jose: Added support for placed address

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33558>
This commit is contained in:
Lionel Landwerlin 2023-09-26 16:10:38 +03:00 • committed by Marge Bot
parent 1d46a663ae
commit 374ef9228b
2 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/intel/vulkan/i915/anv_kmd_backend.c
View file

@ -160,7 +160,7 @@ i915_gem_close(struct anv_device *device, struct anv_bo *bo)
static void *
i915_gem_mmap_offset(struct anv_device *device, struct anv_bo *bo,
uint64_t size, uint32_t flags,
uint64_t offset, uint64_t size, uint32_t flags,
void *placed_addr)
{
struct drm_i915_gem_mmap_offset gem_mmap = {
@ -170,9 +170,27 @@ i915_gem_mmap_offset(struct anv_device *device, struct anv_bo *bo,
if (intel_ioctl(device->fd, DRM_IOCTL_I915_GEM_MMAP_OFFSET, &gem_mmap))
return MAP_FAILED;
return mmap(placed_addr, size, PROT_READ | PROT_WRITE,
(placed_addr != NULL ? MAP_FIXED : 0) | MAP_SHARED,
device->fd, gem_mmap.offset);
if (placed_addr != NULL) {
const uint64_t placed_num = (uintptr_t)placed_addr;
assert(placed_num >= offset);
if (placed_num < offset)
return NULL;
placed_addr -= offset;
}
void *ptr = mmap(placed_addr, offset + size,
PROT_READ | PROT_WRITE,
(placed_addr != NULL ? MAP_FIXED : 0) | MAP_SHARED,
device->fd, gem_mmap.offset);
if (ptr == MAP_FAILED)
return ptr;
if (offset != 0)
munmap(ptr, offset);
return ptr + offset;
}
static void *
@ -221,7 +239,7 @@ i915_gem_mmap(struct anv_device *device, struct anv_bo *bo, uint64_t offset,
const uint32_t flags = mmap_calc_flags(device, bo);
if (likely(device->physical->info.has_mmap_offset))
return i915_gem_mmap_offset(device, bo, size, flags, placed_addr);
return i915_gem_mmap_offset(device, bo, offset, size, flags, placed_addr);
assert(placed_addr == NULL);
return i915_gem_mmap_legacy(device, bo, offset, size, flags);
}

23
src/intel/vulkan/xe/anv_kmd_backend.c
View file

@ -115,9 +115,26 @@ xe_gem_mmap(struct anv_device *device, struct anv_bo *bo, uint64_t offset,
if (intel_ioctl(device->fd, DRM_IOCTL_XE_GEM_MMAP_OFFSET, &args))
return MAP_FAILED;
return mmap(placed_addr, size, PROT_READ | PROT_WRITE,
(placed_addr != NULL ? MAP_FIXED : 0) | MAP_SHARED,
device->fd, args.offset);
if (placed_addr != NULL) {
const uint64_t placed_num = (uintptr_t)placed_addr;
assert(placed_num >= offset);
if (placed_num < offset)
return NULL;
placed_addr -= offset;
}
void *ptr = mmap(placed_addr, offset + size, PROT_READ | PROT_WRITE,
(placed_addr != NULL ? MAP_FIXED : 0) | MAP_SHARED,
device->fd, args.offset);
if (ptr == MAP_FAILED)
return ptr;
if (offset != 0)
munmap(ptr, offset);
return ptr + offset;
}
static inline uint32_t