From 91b3ae71d71789c0846d592c83782b6885c48e2a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 29 Aug 2024 15:03:54 +0300 Subject: [PATCH] iris: fix utrace compute end timestamp reads on Gfx20 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: José Roberto de Souza Part-of: --- src/gallium/drivers/iris/iris_utrace.c | 27 ++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_utrace.c b/src/gallium/drivers/iris/iris_utrace.c index 259f45d48f4..57d9aaabd15 100644 --- a/src/gallium/drivers/iris/iris_utrace.c +++ b/src/gallium/drivers/iris/iris_utrace.c @@ -57,7 +57,19 @@ union iris_utrace_timestamp { * [2] = 32b Context Timestamp End * [3] = 32b Global Timestamp End" */ - uint32_t compute_walker[4]; + uint32_t gfx125_postsync_data[4]; + + /* Timestamp written by COMPUTE_WALKER::PostSync + * + * BSpec 56591: + * + * "The timestamp layout : + * [0] = 64b Context Timestamp Start + * [1] = 64b Global Timestamp Start + * [2] = 64b Context Timestamp End + * [3] = 64b Global Timestamp End" + */ + uint64_t gfx20_postsync_data[4]; }; static void * @@ -136,8 +148,15 @@ iris_utrace_read_ts(struct u_trace_context *utctx, if (ts->timestamp == U_TRACE_NO_TIMESTAMP) return U_TRACE_NO_TIMESTAMP; - /* Detect a 16bytes timestamp write */ - if (ts->compute_walker[2] != 0 || ts->compute_walker[3] != 0) { + /* Detect a 16/32 bytes timestamp write */ + if (ts->gfx20_postsync_data[1] != 0 || + ts->gfx20_postsync_data[2] != 0 || + ts->gfx20_postsync_data[3] != 0) { + if (screen->devinfo->ver >= 20) { + return intel_device_info_timebase_scale(screen->devinfo, + ts->gfx20_postsync_data[3]); + } + /* The timestamp written by COMPUTE_WALKER::PostSync only as 32bits. We * need to rebuild the full 64bits using the previous timestamp. We * assume that utrace is reading the timestamp in order. Anyway @@ -146,7 +165,7 @@ iris_utrace_read_ts(struct u_trace_context *utctx, */ uint64_t timestamp = (ice->utrace.last_full_timestamp & 0xffffffff00000000) | - (uint64_t) ts->compute_walker[3]; + (uint64_t) ts->gfx125_postsync_data[3]; return intel_device_info_timebase_scale(screen->devinfo, timestamp); }