radv: align the LDS size in calculate_tess_lds_size()

[mesa.git] / src / amd / vulkan / radv_cmd_buffer.c

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index bfae582d30c18c2936dbfb023230c4b01ea8ff6b..4130a62d3f9781d27b0e71e0573a172561b274de 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -336,6 +336,31 @@ enum ring_type radv_queue_family_to_ring(int f) {
        }
 }
 
+static void
+radv_destroy_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
+{
+       list_del(&cmd_buffer->pool_link);
+
+       list_for_each_entry_safe(struct radv_cmd_buffer_upload, up,
+                                &cmd_buffer->upload.list, list) {
+               cmd_buffer->device->ws->buffer_destroy(up->upload_bo);
+               list_del(&up->list);
+               free(up);
+       }
+
+       if (cmd_buffer->upload.upload_bo)
+               cmd_buffer->device->ws->buffer_destroy(cmd_buffer->upload.upload_bo);
+
+       if (cmd_buffer->cs)
+               cmd_buffer->device->ws->cs_destroy(cmd_buffer->cs);
+
+       for (unsigned i = 0; i < MAX_BIND_POINTS; i++)
+               free(cmd_buffer->descriptors[i].push_set.set.mapped_ptr);
+
+       vk_object_base_finish(&cmd_buffer->base);
+       vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
+}
+
 static VkResult radv_create_cmd_buffer(
        struct radv_device *                         device,
        struct radv_cmd_pool *                       pool,
@@ -363,7 +388,7 @@ static VkResult radv_create_cmd_buffer(
 
        cmd_buffer->cs = device->ws->cs_create(device->ws, ring);
        if (!cmd_buffer->cs) {
-               vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
+               radv_destroy_cmd_buffer(cmd_buffer);
                return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
        }
 
@@ -374,30 +399,6 @@ static VkResult radv_create_cmd_buffer(
        return VK_SUCCESS;
 }
 
-static void
-radv_cmd_buffer_destroy(struct radv_cmd_buffer *cmd_buffer)
-{
-       list_del(&cmd_buffer->pool_link);
-
-       list_for_each_entry_safe(struct radv_cmd_buffer_upload, up,
-                                &cmd_buffer->upload.list, list) {
-               cmd_buffer->device->ws->buffer_destroy(up->upload_bo);
-               list_del(&up->list);
-               free(up);
-       }
-
-       if (cmd_buffer->upload.upload_bo)
-               cmd_buffer->device->ws->buffer_destroy(cmd_buffer->upload.upload_bo);
-       cmd_buffer->device->ws->cs_destroy(cmd_buffer->cs);
-
-       for (unsigned i = 0; i < MAX_BIND_POINTS; i++)
-               free(cmd_buffer->descriptors[i].push_set.set.mapped_ptr);
-
-       vk_object_base_finish(&cmd_buffer->base);
-
-       vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
-}
-
 static VkResult
 radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
 {
@@ -482,7 +483,8 @@ radv_cmd_buffer_resize_upload_buf(struct radv_cmd_buffer *cmd_buffer,
                                       RADEON_DOMAIN_GTT,
                                       RADEON_FLAG_CPU_ACCESS|
                                       RADEON_FLAG_NO_INTERPROCESS_SHARING |
-                                      RADEON_FLAG_32BIT,
+                                      RADEON_FLAG_32BIT |
+                                      RADEON_FLAG_GTT_WC,
                                       RADV_BO_PRIORITY_UPLOAD_BUFFER);
 
        if (!bo) {
@@ -2715,13 +2717,10 @@ radv_flush_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer,
                        if (cmd_buffer->device->physical_device->rad_info.chip_class != GFX8 && stride)
                                num_records /= stride;
 
-                       desc[0] = va;
-                       desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32) | S_008F04_STRIDE(stride);
-                       desc[2] = num_records;
-                       desc[3] = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
-                                 S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
-                                 S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
-                                 S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
+                       uint32_t rsrc_word3 = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
+                                             S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
+                                             S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
+                                             S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
 
                        if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX10) {
                                /* OOB_SELECT chooses the out-of-bounds check:
@@ -2730,13 +2729,18 @@ radv_flush_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer,
                                 */
                                int oob_select = stride ? V_008F0C_OOB_SELECT_STRUCTURED : V_008F0C_OOB_SELECT_RAW;
 
-                               desc[3] |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_UINT) |
-                                          S_008F0C_OOB_SELECT(oob_select) |
-                                          S_008F0C_RESOURCE_LEVEL(1);
+                               rsrc_word3 |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_UINT) |
+                                            S_008F0C_OOB_SELECT(oob_select) |
+                                            S_008F0C_RESOURCE_LEVEL(1);
                        } else {
-                               desc[3] |= S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_UINT) |
-                                          S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
+                               rsrc_word3 |= S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_UINT) |
+                                            S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
                        }
+
+                       desc[0] = va;
+                       desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32) | S_008F04_STRIDE(stride);
+                       desc[2] = num_records;
+                       desc[3] = rsrc_word3;
                }
 
                va = radv_buffer_get_va(cmd_buffer->upload.upload_bo);
@@ -2827,21 +2831,23 @@ radv_flush_streamout_descriptors(struct radv_cmd_buffer *cmd_buffer)
                        if (cmd_buffer->device->physical_device->use_ngg_streamout)
                                size = buffer->size - sb[i].offset;
 
-                       desc[0] = va;
-                       desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32);
-                       desc[2] = size;
-                       desc[3] = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
-                                 S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
-                                 S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
-                                 S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
+                       uint32_t rsrc_word3 = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) |
+                                             S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) |
+                                             S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) |
+                                             S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W);
 
                        if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX10) {
-                               desc[3] |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_FLOAT) |
-                                          S_008F0C_OOB_SELECT(V_008F0C_OOB_SELECT_RAW) |
-                                          S_008F0C_RESOURCE_LEVEL(1);
+                               rsrc_word3 |= S_008F0C_FORMAT(V_008F0C_IMG_FORMAT_32_FLOAT) |
+                                             S_008F0C_OOB_SELECT(V_008F0C_OOB_SELECT_RAW) |
+                                             S_008F0C_RESOURCE_LEVEL(1);
                        } else {
-                               desc[3] |= S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
+                               rsrc_word3 |= S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32);
                        }
+
+                       desc[0] = va;
+                       desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32);
+                       desc[2] = size;
+                       desc[3] = rsrc_word3;
                }
 
                va = radv_buffer_get_va(cmd_buffer->upload.upload_bo);
@@ -3628,7 +3634,7 @@ void radv_FreeCommandBuffers(
                                list_del(&cmd_buffer->pool_link);
                                list_addtail(&cmd_buffer->pool_link, &cmd_buffer->pool->free_cmd_buffers);
                        } else
-                               radv_cmd_buffer_destroy(cmd_buffer);
+                               radv_destroy_cmd_buffer(cmd_buffer);
 
                }
        }
@@ -4767,12 +4773,12 @@ void radv_DestroyCommandPool(
 
        list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
                                 &pool->cmd_buffers, pool_link) {
-               radv_cmd_buffer_destroy(cmd_buffer);
+               radv_destroy_cmd_buffer(cmd_buffer);
        }
 
        list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
                                 &pool->free_cmd_buffers, pool_link) {
-               radv_cmd_buffer_destroy(cmd_buffer);
+               radv_destroy_cmd_buffer(cmd_buffer);
        }
 
        vk_object_base_finish(&pool->base);
@@ -4809,7 +4815,7 @@ void radv_TrimCommandPool(
 
        list_for_each_entry_safe(struct radv_cmd_buffer, cmd_buffer,
                                 &pool->free_cmd_buffers, pool_link) {
-               radv_cmd_buffer_destroy(cmd_buffer);
+               radv_destroy_cmd_buffer(cmd_buffer);
        }
 }