From 29a9eaf08b8dfa437b27ecea6f365bbf9c30be9c Mon Sep 17 00:00:00 2001 From: Mohamed Ahmed Date: Thu, 19 Mar 2026 04:59:37 +0400 Subject: [PATCH] nvk: Remove nvk_image_plane_size_align_B() Now that we stash the offset and alignment, this helper is redundant. Reviewed-by: Faith Ekstrand Reviewed-by: Mel Henning Tested-by: Mary Guillemard Backport-to: 26.1 Part-of: (cherry picked from commit d04945ed96dee8994a7d038b97a8e064f254e494) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_image.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0470645ed0f..156019bd12a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2154,7 +2154,7 @@ "description": "nvk: Remove nvk_image_plane_size_align_B()", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 0a268c805a0..7df762d8f7a 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -1150,25 +1150,6 @@ nvk_image_init(struct nvk_device *dev, return VK_SUCCESS; } -static void -nvk_image_plane_size_align_B(struct nvk_device *dev, - const struct nvk_image *image, - const struct nvk_image_plane *plane, - uint64_t *size_B_out, uint64_t *align_B_out) -{ - const struct nvk_physical_device *pdev = nvk_device_physical(dev); - const bool sparse_bound = - image->vk.create_flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT; - - assert(util_is_power_of_two_or_zero64(plane->nil.align_B)); - if (sparse_bound || plane->nil.pte_kind) { - *align_B_out = MAX2(plane->nil.align_B, pdev->nvkmd->bind_align_B); - } else { - *align_B_out = plane->nil.align_B; - } - *size_B_out = align64(plane->nil.size_B, *align_B_out); -} - static VkResult nvk_image_plane_alloc_va(struct nvk_device *dev, const struct nvk_image *image,