Mesa (master): turnip: move HLSQ_UPDATE_CNTL write to before xs config writes

[GitLab Mirror]

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

Author: Jonathan Marek <jonathan at marek.ca>
Date:   Sun Jun  7 13:06:42 2020 -0400

turnip: move HLSQ_UPDATE_CNTL write to before xs config writes

This matches the blob and gallium driver more closely, and fixes a
rendering issue observed on a650.

Signed-off-by: Jonathan Marek <jonathan at marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5376>

---

 src/freedreno/vulkan/tu_pipeline.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 158297d9d17..f86d322dc53 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -1294,9 +1294,6 @@ tu6_emit_fs_inputs(struct tu_cs *cs, const struct ir3_shader_variant *fs)
    tu_cs_emit_pkt4(cs, REG_A6XX_HLSQ_UNKNOWN_B980, 1);
    tu_cs_emit(cs, enable_varyings ? 3 : 1);
 
-   tu_cs_emit_pkt4(cs, REG_A6XX_HLSQ_UPDATE_CNTL, 1);
-   tu_cs_emit(cs, 0xff); /* XXX */
-
    tu_cs_emit_pkt4(cs, REG_A6XX_GRAS_CNTL, 1);
    tu_cs_emit(cs,
          CONDREG(ij_pix_regid, A6XX_GRAS_CNTL_VARYING) |
@@ -1587,6 +1584,9 @@ tu6_emit_program(struct tu_cs *cs,
       fs = &dummy_variant;
    }
 
+   tu_cs_emit_pkt4(cs, REG_A6XX_HLSQ_UPDATE_CNTL, 1);
+   tu_cs_emit(cs, 0xff); /* XXX */
+
    tu6_emit_vs_config(cs, builder->shaders[MESA_SHADER_VERTEX], vs);
    tu6_emit_hs_config(cs, builder->shaders[MESA_SHADER_TESS_CTRL], hs);
    tu6_emit_ds_config(cs, builder->shaders[MESA_SHADER_TESS_EVAL], ds);