From 102fed30b95d099f2e83260edaaacfda71c81d84 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 3 Sep 2020 10:30:31 -0700 Subject: [PATCH] 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: (cherry picked from commit 329c31728773d58ebb0a9c2dd133ed7d6bc710cd) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 32b0b19cc3a..2dcf2e376ee 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -760,7 +760,7 @@ "description": "turnip: Fix truncation of CS shader iovas to 32 bits.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "13525a9c706bc3b5aef2b9bc649644f2e3607f31" }, diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 922586b9a61..f792cbd69ed 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -470,7 +470,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,