Module: Mesa Branch: main Commit: cff7bfde723d6d549d3c212be1f8fc53ac1b29b3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cff7bfde723d6d549d3c212be1f8fc53ac1b29b3
Author: Faith Ekstrand <[email protected]> Date: Fri Oct 6 18:45:32 2023 -0500 nvk: Add a nvk_cmd_buffer_compute_cls() helper We have one of these for 3D and it's more ergonamic. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25595> --- src/nouveau/vulkan/nvk_cmd_dispatch.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c index 352462b2259..74f1aae680e 100644 --- a/src/nouveau/vulkan/nvk_cmd_dispatch.c +++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c @@ -39,6 +39,12 @@ #define NVC6C0_QMDV03_00_VAL_SET(p,a...) NVVAL_MW_SET((p), NVC6C0, QMDV03_00, ##a) #define NVC6C0_QMDV03_00_DEF_SET(p,a...) NVDEF_MW_SET((p), NVC6C0, QMDV03_00, ##a) +static inline uint16_t +nvk_cmd_buffer_compute_cls(struct nvk_cmd_buffer *cmd) +{ + return nvk_cmd_buffer_device(cmd)->pdev->info.cls_compute; +} + void nvk_cmd_buffer_begin_compute(struct nvk_cmd_buffer *cmd, const VkCommandBufferBeginInfo *pBeginInfo) @@ -141,7 +147,6 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd, uint64_t *root_desc_addr_out) { const struct nvk_compute_pipeline *pipeline = cmd->state.cs.pipeline; - const struct nvk_device *dev = nvk_cmd_buffer_device(cmd); struct nvk_descriptor_state *desc = &cmd->state.cs.descriptors; VkResult result; @@ -169,7 +174,7 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd, memset(qmd, 0, sizeof(qmd)); memcpy(qmd, pipeline->qmd_template, sizeof(pipeline->qmd_template)); - if (dev->pdev->info.cls_compute >= AMPERE_COMPUTE_A) { + if (nvk_cmd_buffer_compute_cls(cmd) >= AMPERE_COMPUTE_A) { nvc6c0_qmd_set_dispatch_size(nvk_cmd_buffer_device(cmd), qmd, desc->root.cs.group_count[0], desc->root.cs.group_count[1], @@ -177,7 +182,7 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd, nvc6c0_cp_launch_desc_set_cb(qmd, 0, sizeof(desc->root), root_desc_addr); nvc6c0_cp_launch_desc_set_cb(qmd, 1, sizeof(desc->root), root_desc_addr); - } else if (dev->pdev->info.cls_compute >= PASCAL_COMPUTE_A) { + } else if (nvk_cmd_buffer_compute_cls(cmd) >= PASCAL_COMPUTE_A) { nvc0c0_qmd_set_dispatch_size(nvk_cmd_buffer_device(cmd), qmd, desc->root.cs.group_count[0], desc->root.cs.group_count[1], @@ -186,7 +191,7 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd, nvc0c0_cp_launch_desc_set_cb(qmd, 0, sizeof(desc->root), root_desc_addr); nvc0c0_cp_launch_desc_set_cb(qmd, 1, sizeof(desc->root), root_desc_addr); } else { - assert(dev->pdev->info.cls_compute >= KEPLER_COMPUTE_A); + assert(nvk_cmd_buffer_compute_cls(cmd) >= KEPLER_COMPUTE_A); nva0c0_qmd_set_dispatch_size(nvk_cmd_buffer_device(cmd), qmd, desc->root.cs.group_count[0], desc->root.cs.group_count[1], @@ -245,7 +250,6 @@ nvk_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t groupCountZ) { VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); - const struct nvk_device *dev = nvk_cmd_buffer_device(cmd); struct nvk_descriptor_state *desc = &cmd->state.cs.descriptors; desc->root.cs.base_group[0] = baseGroupX; @@ -278,7 +282,7 @@ nvk_CmdDispatchBase(VkCommandBuffer commandBuffer, P_MTHD(p, NVA0C0, SEND_PCAS_A); P_NVA0C0_SEND_PCAS_A(p, qmd_addr >> 8); - if (dev->pdev->info.cls_compute <= TURING_COMPUTE_A) { + if (nvk_cmd_buffer_compute_cls(cmd) <= TURING_COMPUTE_A) { P_IMMD(p, NVA0C0, SEND_SIGNALING_PCAS_B, { .invalidate = INVALIDATE_TRUE, .schedule = SCHEDULE_TRUE @@ -360,7 +364,6 @@ nvk_CmdDispatchIndirect(VkCommandBuffer commandBuffer, { VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); VK_FROM_HANDLE(nvk_buffer, buffer, _buffer); - const struct nvk_device *dev = nvk_cmd_buffer_device(cmd); struct nvk_descriptor_state *desc = &cmd->state.cs.descriptors; /* TODO: Indirect dispatch pre-Turing */ @@ -396,7 +399,7 @@ nvk_CmdDispatchIndirect(VkCommandBuffer commandBuffer, P_MTHD(p, NVA0C0, SEND_PCAS_A); P_NVA0C0_SEND_PCAS_A(p, qmd_addr >> 8); - if (dev->pdev->info.cls_compute <= TURING_COMPUTE_A) { + if (nvk_cmd_buffer_compute_cls(cmd) <= TURING_COMPUTE_A) { P_IMMD(p, NVA0C0, SEND_SIGNALING_PCAS_B, { .invalidate = INVALIDATE_TRUE, .schedule = SCHEDULE_TRUE
