v3dv: make v3dv_bo_alloc allocate memory for the bo struct
This is just going to be more convenient going forward.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
diff --git a/src/broadcom/vulkan/v3dv_bo.c b/src/broadcom/vulkan/v3dv_bo.c
index 95e5695..099223b 100644
--- a/src/broadcom/vulkan/v3dv_bo.c
+++ b/src/broadcom/vulkan/v3dv_bo.c
@@ -27,10 +27,16 @@
#include <sys/mman.h>
#include "drm-uapi/v3d_drm.h"
+#include "util/u_memory.h"
-bool
-v3dv_bo_alloc(struct v3dv_device *device, uint32_t size, struct v3dv_bo *bo)
+struct v3dv_bo *
+v3dv_bo_alloc(struct v3dv_device *device, uint32_t size)
{
+ struct v3dv_bo *bo = vk_alloc(&device->alloc, sizeof(struct v3dv_bo), 8,
+ VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
+ if (!bo)
+ return NULL;
+
const uint32_t page_align = 4096; /* Always allocate full pages */
size = align(size, page_align);
struct drm_v3d_create_bo create = {
@@ -39,7 +45,7 @@
int ret = v3dv_ioctl(device->fd, DRM_IOCTL_V3D_CREATE_BO, &create);
if (ret != 0)
- return false;
+ return NULL;
assert(create.offset % page_align == 0);
assert((create.offset & 0xffffffff) == create.offset);
@@ -50,7 +56,7 @@
bo->map = NULL;
bo->map_size = 0;
- return true;
+ return bo;
}
bool
@@ -68,6 +74,8 @@
if (ret != 0)
fprintf(stderr, "close object %d: %s\n", bo->handle, strerror(errno));
+ vk_free(&device->alloc, bo);
+
return ret == 0;
}
diff --git a/src/broadcom/vulkan/v3dv_bo.h b/src/broadcom/vulkan/v3dv_bo.h
index d6c9cad..49cb893 100644
--- a/src/broadcom/vulkan/v3dv_bo.h
+++ b/src/broadcom/vulkan/v3dv_bo.h
@@ -35,7 +35,7 @@
void *map;
};
-bool v3dv_bo_alloc(struct v3dv_device *device, uint32_t size, struct v3dv_bo *bo);
+struct v3dv_bo *v3dv_bo_alloc(struct v3dv_device *device, uint32_t size);
bool v3dv_bo_free(struct v3dv_device *device, struct v3dv_bo *bo);
diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c
index 96fe7bc..cc96d33 100644
--- a/src/broadcom/vulkan/v3dv_device.c
+++ b/src/broadcom/vulkan/v3dv_device.c
@@ -1017,8 +1017,8 @@
{
/* Our kernel interface is 32-bit */
assert((size & 0xffffffff) == size);
- bool ok = v3dv_bo_alloc(device, size, &mem->bo);
- if (!ok)
+ mem->bo = v3dv_bo_alloc(device, size);
+ if (!mem->bo)
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
return VK_SUCCESS;
}
@@ -1026,7 +1026,7 @@
static void
device_free(struct v3dv_device *device, struct v3dv_device_memory *mem)
{
- v3dv_bo_free(device, &mem->bo);
+ v3dv_bo_free(device, mem->bo);
}
static VkResult
@@ -1040,9 +1040,9 @@
* considered to be currently host mapped. It is an application error to
* call vkMapMemory on a memory object that is already host mapped."
*/
- assert(mem && mem->bo.map == NULL);
+ assert(mem && mem->bo->map == NULL);
- bool ok = v3dv_bo_map(device, &mem->bo, size);
+ bool ok = v3dv_bo_map(device, mem->bo, size);
if (!ok)
return VK_ERROR_MEMORY_MAP_FAILED;
@@ -1052,8 +1052,8 @@
static void
device_unmap(struct v3dv_device *device, struct v3dv_device_memory *mem)
{
- assert(mem && mem->bo.map && mem->bo.map_size > 0);
- v3dv_bo_unmap(device, &mem->bo);
+ assert(mem && mem->bo->map && mem->bo->map_size > 0);
+ v3dv_bo_unmap(device, mem->bo);
}
VkResult
@@ -1096,7 +1096,7 @@
if (mem == NULL)
return;
- if (mem->bo.map)
+ if (mem->bo->map)
v3dv_UnmapMemory(_device, _mem);
device_free(device, mem);
@@ -1120,14 +1120,14 @@
return VK_SUCCESS;
}
- assert(offset < mem->bo.size);
+ assert(offset < mem->bo->size);
/* We always map from the beginning of the region, so if our offset
* is not 0 and we are not mapping the entire region, we need to
* add the offset to the map size.
*/
if (size == VK_WHOLE_SIZE)
- size = mem->bo.size;
+ size = mem->bo->size;
else if (offset > 0)
size += offset;
@@ -1135,7 +1135,7 @@
if (result != VK_SUCCESS)
return vk_error(device->instance, result);
- *ppData = ((uint8_t *) mem->bo.map) + offset;
+ *ppData = ((uint8_t *) mem->bo->map) + offset;
return VK_SUCCESS;
}
@@ -1204,7 +1204,7 @@
* vkGetImageMemoryRequirements with image"
*/
assert(memoryOffset % image->alignment == 0);
- assert(memoryOffset < mem->bo.size);
+ assert(memoryOffset < mem->bo->size);
image->mem = mem;
image->mem_offset = memoryOffset;
@@ -1241,7 +1241,7 @@
* vkGetBufferMemoryRequirements with buffer"
*/
assert(memoryOffset % buffer->alignment == 0);
- assert(memoryOffset < mem->bo.size);
+ assert(memoryOffset < mem->bo->size);
buffer->mem = mem;
buffer->mem_offset = memoryOffset;
diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index e32b635..44d597d 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -168,7 +168,7 @@
};
struct v3dv_device_memory {
- struct v3dv_bo bo;
+ struct v3dv_bo *bo;
const VkMemoryType *type;
};
