diff --git a/.pick_status.json b/.pick_status.json index 0aafca7ae94..763cbbdb383 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -954,7 +954,7 @@ "description": "nvk: Allocate the correct VAB size on Kepler", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "970bd70584610b26198af9736e3b1a30b1373366", "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 45f0f012bd2..5b11490d12b 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -530,6 +530,7 @@ nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p) P_MTHD(p, NV9097, SET_VAB_MEMORY_AREA_A); P_NV9097_SET_VAB_MEMORY_AREA_A(p, vab_addr >> 32); P_NV9097_SET_VAB_MEMORY_AREA_B(p, vab_addr); + assert(dev->vab_memory->va->size_B == 256 * 1024); P_NV9097_SET_VAB_MEMORY_AREA_C(p, SIZE_BYTES_256K); } diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c index 96cbf6127b6..09965dc1fa2 100644 --- a/src/nouveau/vulkan/nvk_device.c +++ b/src/nouveau/vulkan/nvk_device.c @@ -234,7 +234,7 @@ nvk_CreateDevice(VkPhysicalDevice physicalDevice, pdev->info.cls_eng3d < MAXWELL_A) { /* max size is 256k */ result = nvkmd_dev_alloc_mem(dev->nvkmd, &pdev->vk.base, - 1 << 17, 1 << 20, NVKMD_MEM_LOCAL, + 256 * 1024, 0, NVKMD_MEM_LOCAL, &dev->vab_memory); if (result != VK_SUCCESS) goto fail_slm;