radv: update the ZRANGE_PRECISION value for the TC-compat bug
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 13 Jun 2018 12:27:40 +0000 (14:27 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 14 Jun 2018 09:38:29 +0000 (11:38 +0200)
On GFX8+, there is a bug that affects TC-compatible depth surfaces
when the ZRange is not reset after LateZ kills pixels.

The workaround is to always set DB_Z_INFO.ZRANGE_PRECISION to match
the last fast clear value. Because the value is set to 1 by default,
we only need to update it when clearing Z to 0.0.

We also need to set the depth clear regs and to update
ZRANGE_PRECISION when initializing a TC-compat depth image to 0.

Original patch from James Legg.

This fixes random CTS fails with
dEQP-VK.renderpass.suballocation.formats.d32_sfloat_s8_uint.input.*

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105396
CC: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_cmd_buffer.c

index 043b4a2f44ac5debe456196ba08847ed2812a098..53fb4988a8c6b7e6a00035486e0269ab32010ad5 100644 (file)
@@ -1044,6 +1044,68 @@ radv_emit_fb_color_state(struct radv_cmd_buffer *cmd_buffer,
        }
 }
 
+static void
+radv_update_zrange_precision(struct radv_cmd_buffer *cmd_buffer,
+                            struct radv_ds_buffer_info *ds,
+                            struct radv_image *image, VkImageLayout layout,
+                            bool requires_cond_write)
+{
+       uint32_t db_z_info = ds->db_z_info;
+       uint32_t db_z_info_reg;
+
+       if (!radv_image_is_tc_compat_htile(image))
+               return;
+
+       if (!radv_layout_has_htile(image, layout,
+                                  radv_image_queue_family_mask(image,
+                                                               cmd_buffer->queue_family_index,
+                                                               cmd_buffer->queue_family_index))) {
+               db_z_info &= C_028040_TILE_SURFACE_ENABLE;
+       }
+
+       db_z_info &= C_028040_ZRANGE_PRECISION;
+
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9) {
+               db_z_info_reg = R_028038_DB_Z_INFO;
+       } else {
+               db_z_info_reg = R_028040_DB_Z_INFO;
+       }
+
+       /* When we don't know the last fast clear value we need to emit a
+        * conditional packet, otherwise we can update DB_Z_INFO directly.
+        */
+       if (requires_cond_write) {
+               radeon_emit(cmd_buffer->cs, PKT3(PKT3_COND_WRITE, 7, 0));
+
+               const uint32_t write_space = 0 << 8;    /* register */
+               const uint32_t poll_space = 1 << 4;     /* memory */
+               const uint32_t function = 3 << 0;       /* equal to the reference */
+               const uint32_t options = write_space | poll_space | function;
+               radeon_emit(cmd_buffer->cs, options);
+
+               /* poll address - location of the depth clear value */
+               uint64_t va = radv_buffer_get_va(image->bo);
+               va += image->offset + image->clear_value_offset;
+
+               /* In presence of stencil format, we have to adjust the base
+                * address because the first value is the stencil clear value.
+                */
+               if (vk_format_is_stencil(image->vk_format))
+                       va += 4;
+
+               radeon_emit(cmd_buffer->cs, va);
+               radeon_emit(cmd_buffer->cs, va >> 32);
+
+               radeon_emit(cmd_buffer->cs, fui(0.0f));          /* reference value */
+               radeon_emit(cmd_buffer->cs, (uint32_t)-1);       /* comparison mask */
+               radeon_emit(cmd_buffer->cs, db_z_info_reg >> 2); /* write address low */
+               radeon_emit(cmd_buffer->cs, 0u);                 /* write address high */
+               radeon_emit(cmd_buffer->cs, db_z_info);
+       } else {
+               radeon_set_context_reg(cmd_buffer->cs, db_z_info_reg, db_z_info);
+       }
+}
+
 static void
 radv_emit_fb_ds_state(struct radv_cmd_buffer *cmd_buffer,
                      struct radv_ds_buffer_info *ds,
@@ -1102,6 +1164,9 @@ radv_emit_fb_ds_state(struct radv_cmd_buffer *cmd_buffer,
 
        }
 
+       /* Update the ZRANGE_PRECISION value for the TC-compat bug. */
+       radv_update_zrange_precision(cmd_buffer, ds, image, layout, true);
+
        radeon_set_context_reg(cmd_buffer->cs, R_028B78_PA_SU_POLY_OFFSET_DB_FMT_CNTL,
                               ds->pa_su_poly_offset_db_fmt_cntl);
 }
@@ -1143,6 +1208,35 @@ radv_set_depth_clear_regs(struct radv_cmd_buffer *cmd_buffer,
                radeon_emit(cmd_buffer->cs, ds_clear_value.stencil); /* R_028028_DB_STENCIL_CLEAR */
        if (aspects & VK_IMAGE_ASPECT_DEPTH_BIT)
                radeon_emit(cmd_buffer->cs, fui(ds_clear_value.depth)); /* R_02802C_DB_DEPTH_CLEAR */
+
+       /* Update the ZRANGE_PRECISION value for the TC-compat bug. This is
+        * only needed when clearing Z to 0.0.
+        */
+       if ((aspects & VK_IMAGE_ASPECT_DEPTH_BIT) &&
+           ds_clear_value.depth == 0.0) {
+               struct radv_framebuffer *framebuffer = cmd_buffer->state.framebuffer;
+               const struct radv_subpass *subpass = cmd_buffer->state.subpass;
+
+               if (!framebuffer || !subpass)
+                       return;
+
+               if (subpass->depth_stencil_attachment.attachment == VK_ATTACHMENT_UNUSED)
+                       return;
+
+               int idx = subpass->depth_stencil_attachment.attachment;
+               VkImageLayout layout = subpass->depth_stencil_attachment.layout;
+               struct radv_attachment_info *att = &framebuffer->attachments[idx];
+               struct radv_image *image = att->attachment->image;
+
+               /* Only needed if the image is currently bound as the depth
+                * surface.
+                */
+               if (att->attachment->image != image)
+                       return;
+
+               radv_update_zrange_precision(cmd_buffer, &att->ds, image,
+                                            layout, false);
+       }
 }
 
 static void
@@ -3784,6 +3878,20 @@ static void radv_initialize_htile(struct radv_cmd_buffer *cmd_buffer,
                                              size, clear_word);
 
        state->flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_DB_META;
+
+       /* Initialize the depth clear registers and update the ZRANGE_PRECISION
+        * value for the TC-compat bug (because ZRANGE_PRECISION is 1 by
+        * default). This is only needed whean clearing Z to 0.0f.
+        */
+       if (radv_image_is_tc_compat_htile(image) && clear_word == 0) {
+               VkImageAspectFlags aspects = VK_IMAGE_ASPECT_DEPTH_BIT;
+               VkClearDepthStencilValue value = {};
+
+               if (vk_format_is_stencil(image->vk_format))
+                       aspects |= VK_IMAGE_ASPECT_STENCIL_BIT;
+
+               radv_set_depth_clear_regs(cmd_buffer, image, value, aspects);
+       }
 }
 
 static void radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffer,