Mesa (master): turnip: Fix truncation of CS shader iovas to 32 bits.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Sep 9 17:44:10 UTC 2020


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

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep  3 10:30:31 2020 -0700

turnip: Fix truncation of CS shader iovas to 32 bits.

This was invalid, and makes VK break consistently with the
msm-next-pgtbables branch.

Fixes: 13525a9c706b ("turnip: pipeline program state refactor")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6592>

---

 src/freedreno/vulkan/tu_pipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 658f1cceb02..36c29879b73 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -471,7 +471,7 @@ tu6_emit_xs_config(struct tu_cs *cs,
 static void
 tu6_emit_cs_config(struct tu_cs *cs, const struct tu_shader *shader,
                    const struct ir3_shader_variant *v,
-                   uint32_t binary_iova)
+                   uint64_t binary_iova)
 {
    tu_cs_emit_regs(cs, A6XX_HLSQ_INVALIDATE_CMD(
          .cs_state = true,



More information about the mesa-commit mailing list