Mesa (master): turnip: add function to allocate aligned memory in a substream cs

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3ab4f994619920c2a02a9cf861538a82532ab2d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ab4f994619920c2a02a9cf861538a82532ab2d3

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Fri Nov 15 15:15:53 2019 -0500

turnip: add function to allocate aligned memory in a substream cs

To use with texture states that need alignment (texconst, sampler, border)

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>

---

 src/freedreno/vulkan/tu_cs.c      | 35 +++++++++++++++++++++++++++++++++++
 src/freedreno/vulkan/tu_cs.h      |  7 +++++++
 src/freedreno/vulkan/tu_private.h |  5 +++++
 3 files changed, 47 insertions(+)

diff --git a/src/freedreno/vulkan/tu_cs.c b/src/freedreno/vulkan/tu_cs.c
index 48242f813ad..22c0527db88 100644
--- a/src/freedreno/vulkan/tu_cs.c
+++ b/src/freedreno/vulkan/tu_cs.c
@@ -263,6 +263,41 @@ tu_cs_begin_sub_stream(struct tu_device *dev,
 }
 
 /**
+ * Allocate count*size dwords, aligned to size dwords.
+ * \a cs must be in TU_CS_MODE_SUB_STREAM mode.
+ *
+ */
+VkResult
+tu_cs_alloc(struct tu_device *dev,
+            struct tu_cs *cs,
+            uint32_t count,
+            uint32_t size,
+            struct ts_cs_memory *memory)
+{
+   assert(cs->mode == TU_CS_MODE_SUB_STREAM);
+   assert(size && size <= 1024);
+
+   if (!count)
+      return VK_SUCCESS;
+
+   /* TODO: smarter way to deal with alignment? */
+
+   VkResult result = tu_cs_reserve_space(dev, cs, count * size + (size-1));
+   if (result != VK_SUCCESS)
+      return result;
+
+   struct tu_bo *bo = cs->bos[cs->bo_count - 1];
+   size_t offset = align(tu_cs_get_offset(cs), size);
+
+   memory->map = bo->map + offset * sizeof(uint32_t);
+   memory->iova = bo->iova + offset * sizeof(uint32_t);
+
+   cs->start = cs->cur = (uint32_t*) bo->map + offset + count * size;
+
+   return VK_SUCCESS;
+}
+
+/**
  * End command packet emission to a sub-stream.  \a sub_cs becomes invalid
  * after this call.
  *
diff --git a/src/freedreno/vulkan/tu_cs.h b/src/freedreno/vulkan/tu_cs.h
index f3e0ade2a36..19fe984b431 100644
--- a/src/freedreno/vulkan/tu_cs.h
+++ b/src/freedreno/vulkan/tu_cs.h
@@ -48,6 +48,13 @@ tu_cs_begin_sub_stream(struct tu_device *dev,
                        uint32_t size,
                        struct tu_cs *sub_cs);
 
+VkResult
+tu_cs_alloc(struct tu_device *dev,
+            struct tu_cs *cs,
+            uint32_t count,
+            uint32_t size,
+            struct ts_cs_memory *memory);
+
 struct tu_cs_entry
 tu_cs_end_sub_stream(struct tu_cs *cs, struct tu_cs *sub_cs);
 
diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index 2532feed14e..4f2b9fefad5 100644
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -508,6 +508,11 @@ struct tu_cs_entry
    uint32_t offset;
 };
 
+struct ts_cs_memory {
+   uint32_t *map;
+   uint64_t iova;
+};
+
 enum tu_cs_mode
 {