fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-04 16:50:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv/trtt: inline anv_trtt_init_queues_state()

Browse source 
- There's only one caller.
- The caller is rather small.
- We want to introduce initialization code that's not exactly queue
  state and reuse the 'submit'.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30953>
This commit is contained in:
Paulo Zanoni 2024-08-27 14:11:06 -07:00 • committed by Marge Bot
parent 6af1d1ae7f
commit 3845d0d393
1 changed files with 58 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
src/intel/vulkan/anv_sparse.c
View file

@ -404,67 +404,6 @@ trtt_get_page_table_bo(struct anv_device *device, struct anv_bo **bo,
return VK_SUCCESS;
}
static VkResult
anv_trtt_init_queues_state(struct anv_device *device)
{
struct anv_trtt *trtt = &device->trtt;
struct anv_bo *l3_bo;
VkResult result = trtt_get_page_table_bo(device, &l3_bo, &trtt->l3_addr);
if (result != VK_SUCCESS)
return result;
trtt->l3_mirror = vk_zalloc(&device->vk.alloc, 4096, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!trtt->l3_mirror)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
/* L3 has 512 entries, so we can have up to 512 L2 tables. */
trtt->l2_mirror = vk_zalloc(&device->vk.alloc, 512 * 4096, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!trtt->l2_mirror) {
vk_free(&device->vk.alloc, trtt->l3_mirror);
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
}
struct anv_async_submit submits[device->queue_count];
int submits_used = 0;
for (uint32_t i = 0; i < device->queue_count; i++) {
struct anv_queue *q = &device->queues[i];
result = anv_async_submit_init(&submits[submits_used], q,
&device->batch_bo_pool, false, true);
if (result != VK_SUCCESS)
break;
struct anv_async_submit *submit = &submits[submits_used++];
result = anv_genX(device->info, init_trtt_context_state)(submit);
if (result != VK_SUCCESS) {
anv_async_submit_fini(submit);
submits_used--;
break;
}
anv_genX(device->info, async_submit_end)(submit);
result = device->kmd_backend->queue_exec_async(submit, 0, NULL, 1,
&submit->signal);
if (result != VK_SUCCESS) {
anv_async_submit_fini(submit);
submits_used--;
break;
}
}
for (uint32_t i = 0; i < submits_used; i++) {
anv_async_submit_wait(&submits[i]);
anv_async_submit_fini(&submits[i]);
}
return result;
}
/* For L3 and L2 pages, null and invalid entries are indicated by bits 1 and 0
* respectively. For L1 entries, the hardware compares the addresses against
* what we program to the GFX_TRTT_NULL and GFX_TRTT_INVAL registers.
@ -678,13 +617,67 @@ anv_trtt_first_bind_init(struct anv_device *device)
simple_mtx_lock(&trtt->mutex);
/* This means we have already initialized the first bind. */
if (likely(trtt->l3_addr))
goto out;
if (likely(trtt->l3_addr)) {
simple_mtx_unlock(&trtt->mutex);
return VK_SUCCESS;
}
result = anv_trtt_init_queues_state(device);
struct anv_async_submit submits[device->queue_count];
struct anv_bo *l3_bo;
result = trtt_get_page_table_bo(device, &l3_bo, &trtt->l3_addr);
if (result != VK_SUCCESS)
goto out;
assert(trtt->l3_addr);
trtt->l3_mirror = vk_zalloc(&device->vk.alloc, 4096, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!trtt->l3_mirror) {
result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
goto out;
}
/* L3 has 512 entries, so we can have up to 512 L2 tables. */
trtt->l2_mirror = vk_zalloc(&device->vk.alloc, 512 * 4096, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!trtt->l2_mirror) {
vk_free(&device->vk.alloc, trtt->l3_mirror);
result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
goto out;
}
int submits_used = 0;
for (uint32_t i = 0; i < device->queue_count; i++) {
struct anv_queue *q = &device->queues[i];
result = anv_async_submit_init(&submits[submits_used], q,
&device->batch_bo_pool, false, true);
if (result != VK_SUCCESS)
break;
struct anv_async_submit *submit = &submits[submits_used++];
result = anv_genX(device->info, init_trtt_context_state)(submit);
if (result != VK_SUCCESS) {
anv_async_submit_fini(submit);
submits_used--;
break;
}
anv_genX(device->info, async_submit_end)(submit);
result = device->kmd_backend->queue_exec_async(submit, 0, NULL, 1,
&submit->signal);
if (result != VK_SUCCESS) {
anv_async_submit_fini(submit);
submits_used--;
break;
}
}
for (uint32_t i = 0; i < submits_used; i++) {
anv_async_submit_wait(&submits[i]);
anv_async_submit_fini(&submits[i]);
}
out:
simple_mtx_unlock(&trtt->mutex);