From ff4455af781ef4ad5fc86343b05d8e51128a2bfa Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 1 Jun 2021 12:26:27 -0400 Subject: [PATCH] anv: fix availability for copying timestamp query results idx here is the index of the value being written, so if it isn't used/incremented when the query result is written, the availability result will clobber it and be written to the same buffer offset Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 5515d3aec5ebe4e7dd7428aefdc2c1933414cd92) --- .pick_status.json | 2 +- src/intel/vulkan/genX_query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f6b7454fa25..97053fba6a1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1831,7 +1831,7 @@ "description": "anv: fix availability for copying timestamp query results", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index 23e3d1a9f60..dbb074c4170 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -1448,7 +1448,7 @@ void genX(CmdCopyQueryPoolResults)( case VK_QUERY_TYPE_TIMESTAMP: result = mi_mem64(anv_address_add(query_addr, 8)); - gpu_write_query_result(&b, dest_addr, flags, 0, result); + gpu_write_query_result(&b, dest_addr, flags, idx++, result); break; #if GFX_VER >= 8