Module: Mesa
Branch: staging/23.2
Commit: 739d44b0fca5a786346b319b4e1c05b7372dfc22
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=739d44b0fca5a786346b319b4e1c05b7372dfc22

Author: Lionel Landwerlin <[email protected]>
Date:   Fri Aug 25 23:15:29 2023 +0300

anv: fix utrace timestamp buffer copies

Fixes: 521c216efc ("anv: use COMPUTE_WALKER post sync field to track compute 
work")
Acked-by: Emma Anholt <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24744>
(cherry picked from commit e0f420c3348417d980d3bed27b20debafd5b6aef)

---

 .pick_status.json             | 2 +-
 src/intel/vulkan/anv_utrace.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 82f58b46caf..e2486fcf2d0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -134,7 +134,7 @@
         "description": "anv: fix utrace timestamp buffer copies",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "521c216efcc0d0292ceedb3451c5a0a1ef956083",
         "notes": null
diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c
index d4c997bc6d7..a7b40366bb9 100644
--- a/src/intel/vulkan/anv_utrace.c
+++ b/src/intel/vulkan/anv_utrace.c
@@ -104,9 +104,9 @@ anv_device_utrace_emit_copy_ts_buffer(struct 
u_trace_context *utctx,
       container_of(utctx, struct anv_device, ds.trace_context);
    struct anv_utrace_submit *submit = cmdstream;
    struct anv_address from_addr = (struct anv_address) {
-      .bo = ts_from, .offset = from_offset * sizeof(uint64_t) };
+      .bo = ts_from, .offset = from_offset * sizeof(union 
anv_utrace_timestamp) };
    struct anv_address to_addr = (struct anv_address) {
-      .bo = ts_to, .offset = to_offset * sizeof(uint64_t) };
+      .bo = ts_to, .offset = to_offset * sizeof(union anv_utrace_timestamp) };
 
    anv_genX(device->info, emit_so_memcpy)(&submit->memcpy_state,
                                           to_addr, from_addr,

Reply via email to