[Mesa-dev] [PATCH] radv: use WAIT_REG_MEM_GREATER_OR_EQUAL instead of a magic value

Samuel Pitoiset samuel.pitoiset at gmail.com
Tue Oct 30 11:29:13 UTC 2018


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/amd/common/sid.h        | 1 +
 src/amd/vulkan/radv_query.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h
index d88ecf5580..5c53133147 100644
--- a/src/amd/common/sid.h
+++ b/src/amd/common/sid.h
@@ -146,6 +146,7 @@
 #define PKT3_WAIT_REG_MEM                      0x3C
 #define		WAIT_REG_MEM_EQUAL		3
 #define		WAIT_REG_MEM_NOT_EQUAL		4
+#define		WAIT_REG_MEM_GREATER_OR_EQUAL   5
 #define         WAIT_REG_MEM_MEM_SPACE(x)       (((unsigned)(x) & 0x3) << 4)
 #define         WAIT_REG_MEM_PFP		(1 << 8)
 #define PKT3_MEM_WRITE                         0x3D /* not on CIK */
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 5a326c9df5..d61a272a74 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1039,7 +1039,7 @@ void radv_CmdCopyQueryPoolResults(
 
 				/* Waits on the upper word of the last DB entry */
 				radeon_emit(cs, PKT3(PKT3_WAIT_REG_MEM, 5, 0));
-				radeon_emit(cs, 5 | WAIT_REG_MEM_MEM_SPACE(1));
+				radeon_emit(cs, WAIT_REG_MEM_GREATER_OR_EQUAL | WAIT_REG_MEM_MEM_SPACE(1));
 				radeon_emit(cs, src_va);
 				radeon_emit(cs, src_va >> 32);
 				radeon_emit(cs, 0x80000000); /* reference value */
-- 
2.19.1



More information about the mesa-dev mailing list