From a2c813a6d39a48bcde9441930292f9c45af4c559 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 3 Sep 2024 11:23:24 -0500
Subject: [PATCH] nvk/nvkmd: Don't inline nvkmd_mem_[un]map()

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31004>
---
 src/nouveau/vulkan/nvkmd/nvkmd.c | 27 +++++++++++++++++++++++++++
 src/nouveau/vulkan/nvkmd/nvkmd.h | 26 +++-----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/nouveau/vulkan/nvkmd/nvkmd.c b/src/nouveau/vulkan/nvkmd/nvkmd.c
index 2f2b44bcda7..7885a96d592 100644
--- a/src/nouveau/vulkan/nvkmd/nvkmd.c
+++ b/src/nouveau/vulkan/nvkmd/nvkmd.c
@@ -212,3 +212,30 @@ nvkmd_mem_unref(struct nvkmd_mem *mem)
 
    mem->ops->free(mem);
 }
+
+VkResult
+nvkmd_mem_map(struct nvkmd_mem *mem, struct vk_object_base *log_obj,
+              enum nvkmd_mem_map_flags flags, void *fixed_addr,
+              void **map_out)
+{
+   assert(mem->map == NULL);
+
+   void *map = NULL;
+   VkResult result = mem->ops->map(mem, log_obj, flags, fixed_addr, &map);
+   if (result != VK_SUCCESS)
+      return result;
+
+   mem->map = map;
+   if (map_out != NULL)
+      *map_out = map;
+
+   return VK_SUCCESS;
+}
+
+void
+nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags)
+{
+   assert(mem->map != NULL);
+   mem->ops->unmap(mem, flags, mem->map);
+   mem->map = NULL;
+}
diff --git a/src/nouveau/vulkan/nvkmd/nvkmd.h b/src/nouveau/vulkan/nvkmd/nvkmd.h
index 1d16360015d..a73289d5a39 100644
--- a/src/nouveau/vulkan/nvkmd/nvkmd.h
+++ b/src/nouveau/vulkan/nvkmd/nvkmd.h
@@ -456,32 +456,12 @@ nvkmd_mem_ref(struct nvkmd_mem *mem)
 
 void nvkmd_mem_unref(struct nvkmd_mem *mem);
 
-static inline VkResult MUST_CHECK
+VkResult MUST_CHECK
 nvkmd_mem_map(struct nvkmd_mem *mem, struct vk_object_base *log_obj,
               enum nvkmd_mem_map_flags flags, void *fixed_addr,
-              void **map_out)
-{
-   assert(mem->map == NULL);
+              void **map_out);
 
-   void *map = NULL;
-   VkResult result = mem->ops->map(mem, log_obj, flags, fixed_addr, &map);
-   if (result != VK_SUCCESS)
-      return result;
-
-   mem->map = map;
-   if (map_out != NULL)
-      *map_out = map;
-
-   return VK_SUCCESS;
-}
-
-static inline void
-nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags)
-{
-   assert(mem->map != NULL);
-   mem->ops->unmap(mem, flags, mem->map);
-   mem->map = NULL;
-}
+void nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags);
 
 static inline VkResult MUST_CHECK
 nvkmd_mem_overmap(struct nvkmd_mem *mem, struct vk_object_base *log_obj,