Mesa (master): radv: wait on the high 32 bits of timestamp queries

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Dec  5 11:45:19 2018 +0100

radv: wait on the high 32 bits of timestamp queries

In case we are unlucky if the low part is 0xffffffff.

Fixes: 5d6a560a29 ("radv: do not use the availability bit for timestamp queries")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_query.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 276cc1c42d..3c62b71dd6 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1336,8 +1336,11 @@ void radv_CmdCopyQueryPoolResults(
 
 
 			if (flags & VK_QUERY_RESULT_WAIT_BIT) {
+				/* Wait on the high 32 bits of the timestamp in
+				 * case the low part is 0xffffffff.
+				 */
 				radv_cp_wait_mem(cs, WAIT_REG_MEM_NOT_EQUAL,
-						 local_src_va,
+						 local_src_va + 4,
 						 TIMESTAMP_NOT_READY >> 32,
 						 0xffffffff);
 			}