fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 23:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

panvk: Conditionally register an host address when tracking user memory

Browse source 
When PANVK_DEBUG=dump, all internal buffers get dumped, but not the user
ones, because they don't have a host address attached to them. Let's
register one when mappings dump is enabled.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30736>
This commit is contained in:
Boris Brezillon 2024-06-28 12:05:01 +02:00 • committed by Marge Bot
parent b7e0f14959
commit c257bf5142
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panfrost/vulkan/panvk_device_memory.c
View file

@ -20,6 +20,8 @@ panvk_AllocateMemory(VkDevice _device,
VkDeviceMemory *pMem) VkDeviceMemory *pMem)
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
struct panvk_instance *instance =
to_panvk_instance(device->vk.physical->instance);
struct panvk_device_memory *mem; struct panvk_device_memory *mem;
bool can_be_exported = false; bool can_be_exported = false;
VkResult result; VkResult result;
@ -110,8 +112,15 @@ panvk_AllocateMemory(VkDevice _device,
} }
if (device->debug.decode_ctx) { if (device->debug.decode_ctx) {
pandecode_inject_mmap(device->debug.decode_ctx, mem->addr.dev, NULL, if (instance->debug_flags & PANVK_DEBUG_DUMP) {
pan_kmod_bo_size(mem->bo), NULL); mem->debug.host_mapping =
pan_kmod_bo_mmap(mem->bo, 0, pan_kmod_bo_size(mem->bo),
PROT_READ | PROT_WRITE, MAP_SHARED, NULL);
}
pandecode_inject_mmap(device->debug.decode_ctx, mem->addr.dev,
mem->debug.host_mapping, pan_kmod_bo_size(mem->bo),
NULL);
} }
*pMem = panvk_device_memory_to_handle(mem); *pMem = panvk_device_memory_to_handle(mem);
@ -139,6 +148,9 @@ panvk_FreeMemory(VkDevice _device, VkDeviceMemory _mem,
if (device->debug.decode_ctx) { if (device->debug.decode_ctx) {
pandecode_inject_free(device->debug.decode_ctx, mem->addr.dev, pandecode_inject_free(device->debug.decode_ctx, mem->addr.dev,
pan_kmod_bo_size(mem->bo)); pan_kmod_bo_size(mem->bo));
if (mem->debug.host_mapping)
os_munmap(mem->debug.host_mapping, pan_kmod_bo_size(mem->bo));
} }
struct pan_kmod_vm_op op = { struct pan_kmod_vm_op op = {

6
src/panfrost/vulkan/panvk_device_memory.h
View file

@ -19,6 +19,12 @@ struct panvk_device_memory {
uint64_t dev; uint64_t dev;
void *host; void *host;
} addr; } addr;
struct {
/* Don't use this pointer, it's only to have user memory dumped when
* PANVK_DEBUG=dump. */
void *host_mapping;
} debug;
}; };
VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_device_memory, vk.base, VkDeviceMemory, VK_DEFINE_NONDISP_HANDLE_CASTS(panvk_device_memory, vk.base, VkDeviceMemory,