Module: Mesa
Branch: main
Commit: c1f08608b8097dfce7d6a79bcb8b7ed13b0b044b
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1f08608b8097dfce7d6a79bcb8b7ed13b0b044b

Author: Pierre-Eric Pelloux-Prayer <[email protected]>
Date:   Tue Oct  3 10:04:06 2023 +0200

radeonsi/sqtt: fix capturing indirect dispatches with SQTT

Ported from radv 083e7d3a92f362b2a901a.

Reviewed-by: Marek Olšák <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774>

---

 src/gallium/drivers/radeonsi/si_compute.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_compute.c 
b/src/gallium/drivers/radeonsi/si_compute.c
index 7f62d80b0c5..e7964601a84 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -790,9 +790,15 @@ static void si_emit_dispatch_packets(struct si_context 
*sctx, const struct pipe_
       threadgroups_per_cu = 2;
 
    if (unlikely(sctx->sqtt_enabled)) {
-      si_write_event_with_dims_marker(sctx, &sctx->gfx_cs,
-                                      info->indirect ? 
EventCmdDispatchIndirect : EventCmdDispatch,
-                                      info->grid[0], info->grid[1], 
info->grid[2]);
+      if (info->indirect) {
+         si_sqtt_write_event_marker(sctx, &sctx->gfx_cs,
+                                    EventCmdDispatchIndirect,
+                                    UINT_MAX, UINT_MAX, UINT_MAX);
+      } else {
+         si_write_event_with_dims_marker(sctx, &sctx->gfx_cs,
+                                         EventCmdDispatch,
+                                         info->grid[0], info->grid[1], 
info->grid[2]);
+      }
    }
 
    radeon_begin(cs);

Reply via email to