AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: fix utrace compute end timestamp reads on Gfx20

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30923>
This commit is contained in:
Lionel Landwerlin
2024-08-29 15:03:54 +03:00
committed by Marge Bot
parent 14d772d678
commit 91b3ae71d7
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/iris/iris_utrace.c
+23 -4
View File
@@ -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);
}