From 6e214f21579456d7f149986fcebd0448365ee6e6 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 17 Jan 2024 15:47:14 -0600 Subject: [PATCH] nvk: Properly configure the min/max shared mem size We don't really understand what these values are supposed to be but this is a lot closer to what the blob does and lets more compute tests pass. Part-of: --- src/nouveau/vulkan/nvk_compute_pipeline.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nouveau/vulkan/nvk_compute_pipeline.c b/src/nouveau/vulkan/nvk_compute_pipeline.c index bec98c4b3d3..ebe8d73a4fe 100644 --- a/src/nouveau/vulkan/nvk_compute_pipeline.c +++ b/src/nouveau/vulkan/nvk_compute_pipeline.c @@ -116,9 +116,9 @@ nvc3c0_compute_setup_launch_desc_template(uint32_t *qmd, NVC3C0_QMDV02_02_VAL_SET(qmd, SM_GLOBAL_CACHING_ENABLE, 1); /* those are all QMD 2.2+ */ NVC3C0_QMDV02_02_VAL_SET(qmd, MIN_SM_CONFIG_SHARED_MEM_SIZE, - gv100_sm_config_smem_size(8 * 1024)); + gv100_sm_config_smem_size(shader->info.cs.smem_size)); NVC3C0_QMDV02_02_VAL_SET(qmd, MAX_SM_CONFIG_SHARED_MEM_SIZE, - gv100_sm_config_smem_size(96 * 1024)); + gv100_sm_config_smem_size(NVK_MAX_SHARED_SIZE)); NVC3C0_QMDV02_02_VAL_SET(qmd, TARGET_SM_CONFIG_SHARED_MEM_SIZE, gv100_sm_config_smem_size(shader->info.cs.smem_size)); @@ -138,9 +138,9 @@ nvc6c0_compute_setup_launch_desc_template(uint32_t *qmd, NVC6C0_QMDV03_00_VAL_SET(qmd, SM_GLOBAL_CACHING_ENABLE, 1); /* those are all QMD 2.2+ */ NVC6C0_QMDV03_00_VAL_SET(qmd, MIN_SM_CONFIG_SHARED_MEM_SIZE, - gv100_sm_config_smem_size(8 * 1024)); + gv100_sm_config_smem_size(shader->info.cs.smem_size)); NVC6C0_QMDV03_00_VAL_SET(qmd, MAX_SM_CONFIG_SHARED_MEM_SIZE, - gv100_sm_config_smem_size(96 * 1024)); + gv100_sm_config_smem_size(NVK_MAX_SHARED_SIZE)); NVC6C0_QMDV03_00_VAL_SET(qmd, TARGET_SM_CONFIG_SHARED_MEM_SIZE, gv100_sm_config_smem_size(shader->info.cs.smem_size));