turnip: add TU_CS_MODE_SUB_STREAM

When in TU_CS_MODE_SUB_STREAM, tu_cs_begin_sub_stream (or
tu_cs_end_sub_stream) should be called instead of tu_cs_begin (or
tu_cs_end).  It gives the caller a TU_CS_MODE_EXTERNAL cs to emit
commands to.

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index 541a37b6dde7f4762da1c44e3f307fd34dc7b8b1..e01de4cf68a6495651d13d765829a788087c0da9 100644 (file)
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -736,7 +736,7 @@ tu_create_cmd_buffer(struct tu_device *device,
    }
 
    tu_bo_list_init(&cmd_buffer->bo_list);
-   tu_cs_init(&cmd_buffer->cs, 4096);
+   tu_cs_init(&cmd_buffer->cs, TU_CS_MODE_GROW, 4096);
 
    *pCommandBuffer = tu_cmd_buffer_to_handle(cmd_buffer);
 

diff --git a/src/freedreno/vulkan/tu_cs.c b/src/freedreno/vulkan/tu_cs.c
index 226abb055106b76c878a6ced8a31541f3908ab67..193ae5cc9fe4670d62e0a440faaff69706302ca9 100644 (file)
--- a/src/freedreno/vulkan/tu_cs.c
+++ b/src/freedreno/vulkan/tu_cs.c
@@ -27,11 +27,13 @@
  * Initialize a command stream.
  */
 void
-tu_cs_init(struct tu_cs *cs, uint32_t initial_size)
+tu_cs_init(struct tu_cs *cs, enum tu_cs_mode mode, uint32_t initial_size)
 {
+   assert(mode != TU_CS_MODE_EXTERNAL);
+
    memset(cs, 0, sizeof(*cs));
 
-   cs->mode = TU_CS_MODE_GROW;
+   cs->mode = mode;
    cs->next_bo_size = initial_size;
 }
 
@@ -209,11 +211,12 @@ tu_cs_add_entry(struct tu_cs *cs)
 
 /**
  * Begin (or continue) command packet emission.  This does nothing but sanity
- * checks currently.
+ * checks currently.  \a cs must not be in TU_CS_MODE_SUB_STREAM mode.
  */
 void
 tu_cs_begin(struct tu_cs *cs)
 {
+   assert(cs->mode != TU_CS_MODE_SUB_STREAM);
    assert(tu_cs_is_empty(cs));
 }
 
@@ -223,10 +226,59 @@ tu_cs_begin(struct tu_cs *cs)
 void
 tu_cs_end(struct tu_cs *cs)
 {
+   assert(cs->mode != TU_CS_MODE_SUB_STREAM);
+
    if (cs->mode == TU_CS_MODE_GROW && !tu_cs_is_empty(cs))
       tu_cs_add_entry(cs);
 }
 
+/**
+ * Begin command packet emission to a sub-stream.  \a cs must be in
+ * TU_CS_MODE_SUB_STREAM mode.
+ *
+ * Return \a sub_cs which is in TU_CS_MODE_EXTERNAL mode.
+ */
+VkResult
+tu_cs_begin_sub_stream(struct tu_device *dev,
+                       struct tu_cs *cs,
+                       uint32_t size,
+                       struct tu_cs *sub_cs)
+{
+   assert(cs->mode == TU_CS_MODE_SUB_STREAM);
+   assert(size);
+
+   VkResult result = tu_cs_reserve_space(dev, cs, size);
+   if (result != VK_SUCCESS)
+      return result;
+
+   tu_cs_init_external(sub_cs, cs->cur, cs->reserved_end);
+
+   return VK_SUCCESS;
+}
+
+/**
+ * End command packet emission to a sub-stream.  \a sub_cs becomes invalid
+ * after this call.
+ *
+ * Return an IB entry for the sub-stream.  The entry has the same lifetime as
+ * \a cs.
+ */
+struct tu_cs_entry
+tu_cs_end_sub_stream(struct tu_cs *cs, struct tu_cs *sub_cs)
+{
+   assert(cs->mode == TU_CS_MODE_SUB_STREAM);
+   assert(cs->bo_count);
+   assert(sub_cs->cur >= cs->start && sub_cs->cur <= cs->reserved_end);
+
+   cs->cur = sub_cs->cur;
+
+   return (struct tu_cs_entry) {
+      .bo = cs->bos[cs->bo_count - 1],
+      .size = tu_cs_get_size(cs) * sizeof(uint32_t),
+      .offset = tu_cs_get_offset(cs) * sizeof(uint32_t),
+   };
+}
+
 /**
  * Reserve space from a command stream for \a reserved_size uint32_t values.
  * This never fails when \a cs has mode TU_CS_MODE_EXTERNAL.
@@ -243,8 +295,12 @@ tu_cs_reserve_space(struct tu_device *dev,
       }
 
       /* add an entry for the exiting command packets */
-      if (!tu_cs_is_empty(cs))
+      if (!tu_cs_is_empty(cs)) {
+         /* no direct command packet for TU_CS_MODE_SUB_STREAM */
+         assert(cs->mode != TU_CS_MODE_SUB_STREAM);
+
          tu_cs_add_entry(cs);
+      }
 
       /* switch to a new BO */
       uint32_t new_size = MAX2(cs->next_bo_size, reserved_size);

diff --git a/src/freedreno/vulkan/tu_cs.h b/src/freedreno/vulkan/tu_cs.h
index e7c8a11617a9561e3729b42135f35e059dcd5577..05e077185042dbdd7d4dd3e6a44d594bb3d69d9c 100644 (file)
--- a/src/freedreno/vulkan/tu_cs.h
+++ b/src/freedreno/vulkan/tu_cs.h
@@ -28,7 +28,7 @@
 #include "registers/adreno_pm4.xml.h"
 
 void
-tu_cs_init(struct tu_cs *cs, uint32_t initial_size);
+tu_cs_init(struct tu_cs *cs, enum tu_cs_mode mode, uint32_t initial_size);
 
 void
 tu_cs_init_external(struct tu_cs *cs, uint32_t *start, uint32_t *end);
@@ -42,6 +42,15 @@ tu_cs_begin(struct tu_cs *cs);
 void
 tu_cs_end(struct tu_cs *cs);
 
+VkResult
+tu_cs_begin_sub_stream(struct tu_device *dev,
+                       struct tu_cs *cs,
+                       uint32_t size,
+                       struct tu_cs *sub_cs);
+
+struct tu_cs_entry
+tu_cs_end_sub_stream(struct tu_cs *cs, struct tu_cs *sub_cs);
+
 VkResult
 tu_cs_reserve_space(struct tu_device *dev,
                     struct tu_cs *cs,

diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h
index af397950a946ed771a2b1c40c2b5dd579275401e..5e1835c8ec17aebbebf5d80fef876186817b9a2d 100644 (file)
--- a/src/freedreno/vulkan/tu_private.h
+++ b/src/freedreno/vulkan/tu_private.h
@@ -477,6 +477,16 @@ enum tu_cs_mode
     * This mode does not create any entry or any BO.
     */
    TU_CS_MODE_EXTERNAL,
+
+   /*
+    * A command stream in TU_CS_MODE_SUB_STREAM mode does not support direct
+    * command packet emission.  tu_cs_begin_sub_stream must be called to get a
+    * sub-stream to emit comamnd packets to.  When done with the sub-stream,
+    * tu_cs_end_sub_stream must be called.
+    *
+    * This mode does not create any entry internally.
+    */
+   TU_CS_MODE_SUB_STREAM,
 };
 
 struct tu_cs