diff --git a/src/panfrost/vulkan/panvk_mempool.c b/src/panfrost/vulkan/panvk_mempool.c index 361586964b7..5aa81eda4c1 100644 --- a/src/panfrost/vulkan/panvk_mempool.c +++ b/src/panfrost/vulkan/panvk_mempool.c @@ -24,7 +24,16 @@ */ #include "panvk_mempool.h" -#include "pan_device.h" +#include "panvk_private.h" + +void +panvk_bo_pool_cleanup(struct panvk_bo_pool *bo_pool) +{ + util_dynarray_foreach(&bo_pool->free_bos, struct panvk_priv_bo *, bo) + panvk_priv_bo_destroy(*bo, NULL); + + util_dynarray_fini(&bo_pool->free_bos); +} /* Knockoff u_upload_mgr. Uploads wherever we left off, allocating new entries * when needed. @@ -40,16 +49,16 @@ * packed with conservative lifetime handling. */ -static struct panfrost_bo * +static struct panvk_priv_bo * panvk_pool_alloc_backing(struct panvk_pool *pool, size_t bo_sz) { - struct panfrost_bo *bo; + struct panvk_priv_bo *bo; /* If there's a free BO in our BO pool, let's pick it. */ if (pool->bo_pool && bo_sz == pool->base.slab_size && util_dynarray_num_elements(&pool->bo_pool->free_bos, - struct panfrost_bo *)) { - bo = util_dynarray_pop(&pool->bo_pool->free_bos, struct panfrost_bo *); + struct panvk_priv_bo *)) { + bo = util_dynarray_pop(&pool->bo_pool->free_bos, struct panvk_priv_bo *); } else { /* We don't know what the BO will be used for, so let's flag it * RW and attach it to both the fragment and vertex/tiler jobs. @@ -57,14 +66,14 @@ panvk_pool_alloc_backing(struct panvk_pool *pool, size_t bo_sz) * flags to this function and keep the read/write, * fragment/vertex+tiler pools separate. */ - bo = - panfrost_bo_create(pool->dev, bo_sz, pool->create_flags, pool->label); + bo = panvk_priv_bo_create(pool->dev, bo_sz, pool->create_flags, NULL, + VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); } - if (panfrost_bo_size(bo) == pool->base.slab_size) - util_dynarray_append(&pool->bos, struct panfrost_bo *, bo); + if (pan_kmod_bo_size(bo->bo) == pool->base.slab_size) + util_dynarray_append(&pool->bos, struct panvk_priv_bo *, bo); else - util_dynarray_append(&pool->big_bos, struct panfrost_bo *, bo); + util_dynarray_append(&pool->big_bos, struct panvk_priv_bo *, bo); pool->transient_bo = bo; pool->transient_offset = 0; @@ -77,7 +86,7 @@ panvk_pool_alloc_aligned(struct panvk_pool *pool, size_t sz, unsigned alignment) assert(alignment == util_next_power_of_two(alignment)); /* Find or create a suitable BO */ - struct panfrost_bo *bo = pool->transient_bo; + struct panvk_priv_bo *bo = pool->transient_bo; unsigned offset = ALIGN_POT(pool->transient_offset, alignment); /* If we don't fit, allocate a new backing */ @@ -90,8 +99,8 @@ panvk_pool_alloc_aligned(struct panvk_pool *pool, size_t sz, unsigned alignment) pool->transient_offset = offset + sz; struct panfrost_ptr ret = { - .cpu = bo->ptr.cpu + offset, - .gpu = bo->ptr.gpu + offset, + .cpu = bo->addr.host + offset, + .gpu = bo->addr.dev + offset, }; return ret; @@ -99,7 +108,7 @@ panvk_pool_alloc_aligned(struct panvk_pool *pool, size_t sz, unsigned alignment) PAN_POOL_ALLOCATOR(struct panvk_pool, panvk_pool_alloc_aligned) void -panvk_pool_init(struct panvk_pool *pool, struct panfrost_device *dev, +panvk_pool_init(struct panvk_pool *pool, struct panvk_device *dev, struct panvk_bo_pool *bo_pool, unsigned create_flags, size_t slab_size, const char *label, bool prealloc) { @@ -123,16 +132,16 @@ panvk_pool_reset(struct panvk_pool *pool) if (pool->bo_pool) { unsigned num_bos = panvk_pool_num_bos(pool); void *ptr = util_dynarray_grow(&pool->bo_pool->free_bos, - struct panfrost_bo *, num_bos); + struct panvk_priv_bo *, num_bos); memcpy(ptr, util_dynarray_begin(&pool->bos), - num_bos * sizeof(struct panfrost_bo *)); + num_bos * sizeof(struct panvk_priv_bo *)); } else { - util_dynarray_foreach(&pool->bos, struct panfrost_bo *, bo) - panfrost_bo_unreference(*bo); + util_dynarray_foreach(&pool->bos, struct panvk_priv_bo *, bo) + panvk_priv_bo_destroy(*bo, NULL); } - util_dynarray_foreach(&pool->big_bos, struct panfrost_bo *, bo) - panfrost_bo_unreference(*bo); + util_dynarray_foreach(&pool->big_bos, struct panvk_priv_bo *, bo) + panvk_priv_bo_destroy(*bo, NULL); util_dynarray_clear(&pool->bos); util_dynarray_clear(&pool->big_bos); @@ -151,8 +160,8 @@ void panvk_pool_get_bo_handles(struct panvk_pool *pool, uint32_t *handles) { unsigned idx = 0; - util_dynarray_foreach(&pool->bos, struct panfrost_bo *, bo) { - assert(panfrost_bo_handle(*bo) > 0); - handles[idx++] = panfrost_bo_handle(*bo); + util_dynarray_foreach(&pool->bos, struct panvk_priv_bo *, bo) { + assert(pan_kmod_bo_handle((*bo)->bo) > 0); + handles[idx++] = pan_kmod_bo_handle((*bo)->bo); } } diff --git a/src/panfrost/vulkan/panvk_mempool.h b/src/panfrost/vulkan/panvk_mempool.h index 2aa3156138d..796046fed62 100644 --- a/src/panfrost/vulkan/panvk_mempool.h +++ b/src/panfrost/vulkan/panvk_mempool.h @@ -26,7 +26,8 @@ #define __PANVK_POOL_H__ #include "pan_pool.h" -#include "pan_bo.h" + +struct panvk_priv_bo; struct panvk_bo_pool { struct util_dynarray free_bos; @@ -38,13 +39,7 @@ panvk_bo_pool_init(struct panvk_bo_pool *bo_pool) util_dynarray_init(&bo_pool->free_bos, NULL); } -static inline void -panvk_bo_pool_cleanup(struct panvk_bo_pool *bo_pool) -{ - util_dynarray_foreach(&bo_pool->free_bos, struct panfrost_bo *, bo) - panfrost_bo_unreference(*bo); - util_dynarray_fini(&bo_pool->free_bos); -} +void panvk_bo_pool_cleanup(struct panvk_bo_pool *bo_pool); /* Represents grow-only memory. It may be owned by the batch (OpenGL), or may be unowned for persistent uploads. */ @@ -54,7 +49,7 @@ struct panvk_pool { struct pan_pool base; /* Parent device for allocation */ - struct panfrost_device *dev; + struct panvk_device *dev; /* Label for created BOs */ const char *label; @@ -72,7 +67,7 @@ struct panvk_pool { struct util_dynarray big_bos; /* Current transient BO */ - struct panfrost_bo *transient_bo; + struct panvk_priv_bo *transient_bo; /* Within the topmost transient BO, how much has been used? */ unsigned transient_offset; @@ -84,7 +79,7 @@ to_panvk_pool(struct pan_pool *pool) return container_of(pool, struct panvk_pool, base); } -void panvk_pool_init(struct panvk_pool *pool, struct panfrost_device *dev, +void panvk_pool_init(struct panvk_pool *pool, struct panvk_device *dev, struct panvk_bo_pool *bo_pool, unsigned create_flags, size_t slab_size, const char *label, bool prealloc); @@ -95,7 +90,7 @@ void panvk_pool_cleanup(struct panvk_pool *pool); static inline unsigned panvk_pool_num_bos(struct panvk_pool *pool) { - return util_dynarray_num_elements(&pool->bos, struct panfrost_bo *); + return util_dynarray_num_elements(&pool->bos, struct panvk_priv_bo *); } void panvk_pool_get_bo_handles(struct panvk_pool *pool, uint32_t *handles); diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index aa3b1ef5e1b..3c5836c329a 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -68,6 +68,7 @@ #include "pan_blend.h" #include "pan_blitter.h" +#include "pan_bo.h" #include "pan_desc.h" #include "pan_device.h" #include "pan_jc.h" diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index 996142691e9..92c9a215e2b 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -48,7 +48,7 @@ panvk_debug_adjust_bo_flags(const struct panvk_device *device, uint32_t debug_flags = device->physical_device->instance->debug_flags; if (debug_flags & PANVK_DEBUG_DUMP) - bo_flags &= ~PAN_BO_INVISIBLE; + bo_flags &= ~PAN_KMOD_BO_FLAG_NO_MMAP; return bo_flags; } @@ -1122,17 +1122,16 @@ panvk_create_cmdbuf(struct vk_command_pool *vk_pool, cmdbuf->device = device; - panvk_pool_init(&cmdbuf->desc_pool, &device->pdev, - &pool->desc_bo_pool, 0, 64 * 1024, - "Command buffer descriptor pool", true); - panvk_pool_init(&cmdbuf->tls_pool, &device->pdev, - &pool->tls_bo_pool, - panvk_debug_adjust_bo_flags(device, PAN_BO_INVISIBLE), - 64 * 1024, "TLS pool", false); - panvk_pool_init(&cmdbuf->varying_pool, &device->pdev, - &pool->varying_bo_pool, - panvk_debug_adjust_bo_flags(device, PAN_BO_INVISIBLE), - 64 * 1024, "Varyings pool", false); + panvk_pool_init(&cmdbuf->desc_pool, device, &pool->desc_bo_pool, 0, + 64 * 1024, "Command buffer descriptor pool", true); + panvk_pool_init( + &cmdbuf->tls_pool, device, &pool->tls_bo_pool, + panvk_debug_adjust_bo_flags(device, PAN_KMOD_BO_FLAG_NO_MMAP), 64 * 1024, + "TLS pool", false); + panvk_pool_init( + &cmdbuf->varying_pool, device, &pool->varying_bo_pool, + panvk_debug_adjust_bo_flags(device, PAN_KMOD_BO_FLAG_NO_MMAP), 64 * 1024, + "Varyings pool", false); list_inithead(&cmdbuf->batches); *cmdbuf_out = &cmdbuf->vk; return VK_SUCCESS; diff --git a/src/panfrost/vulkan/panvk_vX_meta.c b/src/panfrost/vulkan/panvk_vX_meta.c index a4d97da1e05..462ca1121b4 100644 --- a/src/panfrost/vulkan/panvk_vX_meta.c +++ b/src/panfrost/vulkan/panvk_vX_meta.c @@ -50,9 +50,9 @@ panvk_per_arch(meta_emit_viewport)(struct pan_pool *pool, uint16_t minx, void panvk_per_arch(meta_init)(struct panvk_device *dev) { - panvk_pool_init(&dev->meta.bin_pool, &dev->pdev, NULL, PAN_BO_EXECUTE, + panvk_pool_init(&dev->meta.bin_pool, dev, NULL, PAN_KMOD_BO_FLAG_EXECUTABLE, 16 * 1024, "panvk_meta binary pool", false); - panvk_pool_init(&dev->meta.desc_pool, &dev->pdev, NULL, 0, 16 * 1024, + panvk_pool_init(&dev->meta.desc_pool, dev, NULL, 0, 16 * 1024, "panvk_meta descriptor pool", false); panvk_per_arch(meta_blit_init)(dev); panvk_per_arch(meta_copy_init)(dev); diff --git a/src/panfrost/vulkan/panvk_vX_meta_blit.c b/src/panfrost/vulkan/panvk_vX_meta_blit.c index 30973508616..2cedd6359c7 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_blit.c +++ b/src/panfrost/vulkan/panvk_vX_meta_blit.c @@ -227,10 +227,10 @@ panvk_per_arch(CmdResolveImage2)(VkCommandBuffer commandBuffer, void panvk_per_arch(meta_blit_init)(struct panvk_device *dev) { - panvk_pool_init(&dev->meta.blitter.bin_pool, &dev->pdev, NULL, - PAN_BO_EXECUTE, 16 * 1024, "panvk_meta blitter binary pool", - false); - panvk_pool_init(&dev->meta.blitter.desc_pool, &dev->pdev, NULL, 0, 16 * 1024, + panvk_pool_init(&dev->meta.blitter.bin_pool, dev, NULL, + PAN_KMOD_BO_FLAG_EXECUTABLE, 16 * 1024, + "panvk_meta blitter binary pool", false); + panvk_pool_init(&dev->meta.blitter.desc_pool, dev, NULL, 0, 16 * 1024, "panvk_meta blitter descriptor pool", false); pan_blend_shader_cache_init(&dev->meta.blend_shader_cache, dev->physical_device->kmod.props.gpu_prod_id);