mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-30 21:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

panvk: Transition to explicit VA assignment on v10+

Browse Source 
Panthor allows us to control the GPU virtual address space,
which, among other things, will allow us to support sparse
bindings.

Let's tweak the device initialization and BO mapping to
takes this explicit VA management mode into account.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Reviewed-by: John Anthony <john.anthony@arm.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30969>
This commit is contained in:
Boris Brezillon 2024-08-20 14:56:38 +02:00 committed by Marge Bot
parent ca79fc99cd
commit 53fb1d99ca
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/panfrost/vulkan/panvk_device.h
View File

@ -23,11 +23,17 @@
#include "pan_blend.h"
#include "pan_blitter.h"
#include "util/vma.h"
#define PANVK_MAX_QUEUE_FAMILIES 1
struct panvk_device {
struct vk_device vk;
struct {
struct util_vma_heap heap;
} as;
struct {
struct pan_kmod_vm *vm;
struct pan_kmod_dev *dev;

13
src/panfrost/vulkan/panvk_device_memory.c
View File

@ -89,6 +89,16 @@ panvk_AllocateMemory(VkDevice _device,
},
};
if (!(device->kmod.vm->flags & PAN_KMOD_VM_FLAG_AUTO_VA)) {
op.va.start =
util_vma_heap_alloc(&device->as.heap, op.va.size,
op.va.size > 0x200000 ? 0x200000 : 0x1000);
if (!op.va.start) {
result = vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
goto err_put_bo;
}
}
int ret =
pan_kmod_vm_bind(device->kmod.vm, PAN_KMOD_VM_OP_MODE_IMMEDIATE, &op, 1);
if (ret) {
@ -165,6 +175,9 @@ panvk_FreeMemory(VkDevice _device, VkDeviceMemory _mem,
pan_kmod_vm_bind(device->kmod.vm, PAN_KMOD_VM_OP_MODE_IMMEDIATE, &op, 1);
assert(!ret);
if (!(device->kmod.vm->flags & PAN_KMOD_VM_FLAG_AUTO_VA))
util_vma_heap_free(&device->as.heap, op.va.start, op.va.size);
pan_kmod_bo_put(mem->bo);
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
}

10
src/panfrost/vulkan/panvk_priv_bo.c
View File

@ -52,6 +52,13 @@ panvk_priv_bo_create(struct panvk_device *dev, size_t size, uint32_t flags,
},
};
if (!(dev->kmod.vm->flags & PAN_KMOD_VM_FLAG_AUTO_VA)) {
op.va.start = util_vma_heap_alloc(
&dev->as.heap, op.va.size, op.va.size > 0x200000 ? 0x200000 : 0x1000);
if (!op.va.start)
goto err_munmap_bo;
}
ret = pan_kmod_vm_bind(dev->kmod.vm, PAN_KMOD_VM_OP_MODE_IMMEDIATE, &op, 1);
if (ret)
goto err_munmap_bo;
@ -103,6 +110,9 @@ panvk_priv_bo_destroy(struct panvk_priv_bo *priv_bo)
pan_kmod_vm_bind(dev->kmod.vm, PAN_KMOD_VM_OP_MODE_IMMEDIATE, &op, 1);
assert(!ret);
if (!(dev->kmod.vm->flags & PAN_KMOD_VM_FLAG_AUTO_VA))
util_vma_heap_free(&dev->as.heap, op.va.start, op.va.size);
if (priv_bo->addr.host) {
ret = os_munmap(priv_bo->addr.host, pan_kmod_bo_size(priv_bo->bo));
assert(!ret);

8
src/panfrost/vulkan/panvk_vX_device.c
View File

@ -269,9 +269,13 @@ panvk_per_arch(create_device)(struct panvk_physical_device *physical_device,
device->kmod.dev, PANVK_VA_RESERVE_BOTTOM);
uint64_t user_va_end =
panfrost_clamp_to_usable_va_range(device->kmod.dev, 1ull << 32);
uint32_t vm_flags = PAN_ARCH <= 7 ? PAN_KMOD_VM_FLAG_AUTO_VA : 0;
util_vma_heap_init(&device->as.heap, user_va_start,
user_va_end - user_va_start);
device->kmod.vm =
pan_kmod_vm_create(device->kmod.dev, PAN_KMOD_VM_FLAG_AUTO_VA,
pan_kmod_vm_create(device->kmod.dev, vm_flags,
user_va_start, user_va_end - user_va_start);
if (!device->kmod.vm) {
@ -365,6 +369,7 @@ err_free_priv_bos:
panvk_priv_bo_unref(device->tiler_heap);
panvk_device_cleanup_mempools(device);
pan_kmod_vm_destroy(device->kmod.vm);
util_vma_heap_finish(&device->as.heap);
err_destroy_kdev:
pan_kmod_dev_destroy(device->kmod.dev);
@ -398,6 +403,7 @@ panvk_per_arch(destroy_device)(struct panvk_device *device,
panvk_priv_bo_unref(device->sample_positions);
panvk_device_cleanup_mempools(device);
pan_kmod_vm_destroy(device->kmod.vm);
util_vma_heap_finish(&device->as.heap);
if (device->debug.decode_ctx)
pandecode_destroy_context(device->debug.decode_ctx);