fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 12:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: suballocate feedback slot with feedback buffer alignment

Browse source 
Venus sync feedback design relies on concurrent host device resource
access. To avoid device flush overwriting host writes, we must
suballocate the slots with a minimum size of the buffer alignment.

Cc: mesa-stable
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23633>
This commit is contained in:
Yiwei Zhang 2023-06-13 13:43:13 -07:00 • committed by Marge Bot
parent b2ed33fb4d
commit 2f729ff6aa
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/virtio/vulkan/vn_feedback.c
View file

@ -141,6 +141,13 @@ vn_feedback_buffer_destroy(struct vn_device *dev,
vk_free(alloc, feedback_buf);
}
static inline uint32_t
vn_get_feedback_buffer_alignment(struct vn_feedback_buffer *feedback_buf)
{
struct vn_buffer *buf = vn_buffer_from_handle(feedback_buf->buffer);
return buf->requirements.memory.memoryRequirements.alignment;
}
static VkResult
vn_feedback_pool_grow_locked(struct vn_feedback_pool *pool)
{
@ -154,6 +161,7 @@ vn_feedback_pool_grow_locked(struct vn_feedback_pool *pool)
return result;
pool->used = 0;
pool->alignment = vn_get_feedback_buffer_alignment(feedback_buf);
list_add(&feedback_buf->head, &pool->feedback_buffers);
@ -172,6 +180,7 @@ vn_feedback_pool_init(struct vn_device *dev,
pool->alloc = alloc;
pool->size = size;
pool->used = size;
pool->alignment = 1;
list_inithead(&pool->feedback_buffers);
list_inithead(&pool->free_slots);
@ -198,18 +207,20 @@ vn_feedback_pool_alloc_locked(struct vn_feedback_pool *pool,
uint32_t *out_offset)
{
VN_TRACE_FUNC();
const uint32_t aligned_size = align(size, 4);
if (unlikely(aligned_size > pool->size - pool->used)) {
/* Default values of pool->used and pool->alignment are used to trigger the
* initial pool grow, and will be properly initialized after that.
*/
if (unlikely(align(size, pool->alignment) > pool->size - pool->used)) {
VkResult result = vn_feedback_pool_grow_locked(pool);
if (result != VK_SUCCESS)
return NULL;
assert(aligned_size <= pool->size - pool->used);
assert(align(size, pool->alignment) <= pool->size - pool->used);
}
*out_offset = pool->used;
pool->used += aligned_size;
pool->used += align(size, pool->alignment);
return list_first_entry(&pool->feedback_buffers, struct vn_feedback_buffer,
head);

2
src/virtio/vulkan/vn_feedback.h
View file

@ -19,6 +19,8 @@ struct vn_feedback_pool {
uint32_t size;
/* size in bytes used of the active feedback buffer */
uint32_t used;
/* alignment in bytes for slot suballocation from the feedback buffer */
uint32_t alignment;
/* first entry is the active feedback buffer */
struct list_head feedback_buffers;