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

nvk: Use an nvk_mem_stream for nvk_queue_push()

Browse source 
Importantly, this makes nvk_queue_push() no longer stall waiting on the
GPU so we can use it more freely.

Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35356>
This commit is contained in:
Faith Ekstrand 2025-06-04 22:48:14 -04:00 • committed by Marge Bot
parent 3470cd7568
commit e814fc16ff
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/nouveau/vulkan/nvk_queue.c
View file

@ -379,28 +379,14 @@ nvk_queue_push(struct nvk_queue *queue, const struct nv_push *push)
if (vk_queue_is_lost(&queue->vk))
return VK_ERROR_DEVICE_LOST;
struct nvkmd_mem *push_mem;
result = nvkmd_dev_alloc_mapped_mem(dev->nvkmd, &dev->vk.base,
nv_push_dw_count(push) * 4, 0,
NVKMD_MEM_GART,
NVKMD_MEM_MAP_WR, &push_mem);
if (result != VK_SUCCESS)
return result;
const bool sync = pdev->debug_flags & NVK_DEBUG_PUSH_SYNC;
memcpy(push_mem->map, push->start, nv_push_dw_count(push) * 4);
const struct nvkmd_ctx_exec exec = {
.addr = push_mem->va->addr,
.size_B = nv_push_dw_count(push) * 4,
};
result = nvkmd_ctx_exec(queue->exec_ctx, &queue->vk.base, 1, &exec);
if (result == VK_SUCCESS)
result = nvk_mem_stream_push(dev, &queue->push_stream, queue->exec_ctx,
push->start, nv_push_dw_count(push), NULL);
if (result == VK_SUCCESS && sync)
result = nvkmd_ctx_sync(queue->exec_ctx, &queue->vk.base);
nvkmd_mem_unref(push_mem);
const bool debug_sync = pdev->debug_flags & NVK_DEBUG_PUSH_SYNC;
if ((debug_sync && result != VK_SUCCESS) ||
if ((sync && result != VK_SUCCESS) ||
(pdev->debug_flags & NVK_DEBUG_PUSH_DUMP))
vk_push_print(stderr, push, &pdev->info);
@ -537,14 +523,21 @@ nvk_queue_init(struct nvk_device *dev, struct nvk_queue *queue,
goto fail_draw_cb0;
}
result = nvk_queue_init_context_state(queue);
result = nvk_mem_stream_init(dev, &queue->push_stream);
if (result != VK_SUCCESS)
goto fail_bind_ctx;
result = nvk_queue_init_context_state(queue);
if (result != VK_SUCCESS)
goto fail_push_stream;
queue->vk.driver_submit = nvk_queue_submit;
return VK_SUCCESS;
fail_push_stream:
nvk_mem_stream_sync(dev, &queue->push_stream, queue->exec_ctx);
nvk_mem_stream_finish(dev, &queue->push_stream);
fail_bind_ctx:
if (queue->bind_ctx != NULL)
nvkmd_ctx_destroy(queue->bind_ctx);
@ -564,6 +557,8 @@ fail_init:
void
nvk_queue_finish(struct nvk_device *dev, struct nvk_queue *queue)
{
nvk_mem_stream_sync(dev, &queue->push_stream, queue->exec_ctx);
nvk_mem_stream_finish(dev, &queue->push_stream);
if (queue->draw_cb0 != NULL) {
nvk_upload_queue_sync(dev, &dev->upload);
nvkmd_mem_unref(queue->draw_cb0);

7
src/nouveau/vulkan/nvk_queue.h
View file

@ -5,7 +5,7 @@
#ifndef NVK_QUEUE_H
#define NVK_QUEUE_H 1
#include "nvk_private.h"
#include "nvk_mem_stream.h"
#include "vk_queue.h"
#include "nvkmd/nvkmd.h"
@ -42,6 +42,11 @@ struct nvk_queue {
struct nvkmd_ctx *bind_ctx;
struct nvkmd_ctx *exec_ctx;
/* Memory stream to use for anything we need to push that isn't part of a
* command buffer.
*/
struct nvk_mem_stream push_stream;
struct nvk_queue_state state;
/* CB0 for all draw commands on this queue */