From d0f24343371ec2789dff2faaeac651ed189b28e4 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Wed, 3 Sep 2025 00:51:37 -0700 Subject: [PATCH] anv: fix broken utrace The non-compute end flag should be INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE. This fixes the broken anv utrace for anything non-compute that can potentially overlap (execute in parallel). Fixes: 6281b207db9 ("anv: add tracepoints timestamp mode for empty dispatches") Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit c0e51bcf24c7905a2fdc272194744a5fdfe8c345) --- .pick_status.json | 2 +- src/intel/vulkan/anv_utrace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1261fff0ca7..6b0623d444f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4,7 +4,7 @@ "description": "anv: fix broken utrace", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6281b207db9e59ec51274465185e9b3cf4162b7b", "notes": null diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 30e38901546..143d84baff8 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -366,7 +366,7 @@ anv_utrace_record_ts(struct u_trace *ut, void *cs, ANV_TIMESTAMP_REWRITE_COMPUTE_WALKER) : ANV_TIMESTAMP_CAPTURE_END_OF_PIPE; } else { - capture_type = (flags & INTEL_DS_TRACEPOINT_FLAG_END_CS) ? + capture_type = (flags & INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE) ? ANV_TIMESTAMP_CAPTURE_END_OF_PIPE : ANV_TIMESTAMP_CAPTURE_TOP_OF_PIPE; }