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

turnip: Only get bo offset when we need to mmap

Browse source 
The offset we get from MSM_INFO_GET_OFFSET is an offset into the drm fd
for the purpose of mmaping the buffer.
This commit is contained in:
Kristian H. Kristensen 2019-01-16 11:02:38 -08:00 • committed by Chia-I Wu
parent 23d6f0f970
commit 0801019d33
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/freedreno/vulkan/tu_device.c
View file

@ -83,20 +83,6 @@ tu_bo_init_new(struct tu_device *dev, struct tu_bo *bo, uint64_t size)
if (!gem_handle)
goto fail_new;
/* Calling DRM_MSM_GEM_INFO forces the kernel to allocate backing pages. We
* want immediate backing pages because vkAllocateMemory and friends must
* not lazily fail.
*
* TODO(chadv): Must we really call DRM_MSM_GEM_INFO to acquire backing
* pages? I infer so from reading comments in msm_bo.c:bo_allocate(), but
* maybe I misunderstand.
*/
/* TODO: Do we need 'offset' if we have 'iova'? */
uint64_t offset = tu_gem_info_offset(dev, gem_handle);
if (!offset)
goto fail_info;
uint64_t iova = tu_gem_info_iova(dev, gem_handle);
if (!iova)
goto fail_info;
@ -104,7 +90,6 @@ tu_bo_init_new(struct tu_device *dev, struct tu_bo *bo, uint64_t size)
*bo = (struct tu_bo) {
.gem_handle = gem_handle,
.size = size,
.offset = offset,
.iova = iova,
};
@ -122,9 +107,13 @@ tu_bo_map(struct tu_device *dev, struct tu_bo *bo)
if (bo->map)
return VK_SUCCESS;
uint64_t offset = tu_gem_info_offset(dev, bo->gem_handle);
if (!offset)
return vk_error(dev->instance, VK_ERROR_OUT_OF_DEVICE_MEMORY);
/* TODO: Should we use the wrapper os_mmap() like Freedreno does? */
void *map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED,
dev->physical_device->local_fd, bo->offset);
dev->physical_device->local_fd, offset);
if (map == MAP_FAILED)
return vk_error(dev->instance, VK_ERROR_MEMORY_MAP_FAILED);

1
src/freedreno/vulkan/tu_private.h
View file

@ -432,7 +432,6 @@ struct tu_bo
{
uint32_t gem_handle;
uint64_t size;
uint64_t offset;
uint64_t iova;
void *map;
};