Mesa (master): gallium/radeon: assign the highest priority to scratch; make rings second

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Aug 11 22:11:34 2016 +0200

gallium/radeon: assign the highest priority to scratch; make rings second

just FYI, the kernel receives priority/4

Acked-by: Edward O'Callaghan <funfunctor at folklore1984.net>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeon/radeon_winsys.h | 6 ++++--
 src/gallium/drivers/radeonsi/si_debug.c    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
index 8a98ebf..c65b9a4 100644
--- a/src/gallium/drivers/radeon/radeon_winsys.h
+++ b/src/gallium/drivers/radeon/radeon_winsys.h
@@ -197,7 +197,6 @@ enum radeon_bo_priority {
     RADEON_PRIO_VERTEX_BUFFER,
 
     RADEON_PRIO_SHADER_RW_BUFFER = 24,
-    RADEON_PRIO_SCRATCH_BUFFER,
     RADEON_PRIO_COMPUTE_GLOBAL,
 
     RADEON_PRIO_SAMPLER_TEXTURE = 28,
@@ -216,7 +215,10 @@ enum radeon_bo_priority {
     RADEON_PRIO_CMASK = 52,
     RADEON_PRIO_DCC,
     RADEON_PRIO_HTILE,
-    RADEON_PRIO_SHADER_RINGS,
+
+    RADEON_PRIO_SHADER_RINGS = 56,
+
+    RADEON_PRIO_SCRATCH_BUFFER = 60,
     /* 63 is the maximum value */
 };
 
diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index be300ac..a52dfe4 100644
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -548,11 +548,11 @@ static const char *priority_to_string(enum radeon_bo_priority priority)
 	        ITEM(IB2),
 	        ITEM(DRAW_INDIRECT),
 	        ITEM(INDEX_BUFFER),
-	        ITEM(CP_DMA),
 	        ITEM(VCE),
 	        ITEM(UVD),
 	        ITEM(SDMA_BUFFER),
 	        ITEM(SDMA_TEXTURE),
+		ITEM(CP_DMA),
 	        ITEM(USER_SHADER),
 	        ITEM(INTERNAL_SHADER),
 	        ITEM(CONST_BUFFER),
@@ -561,7 +561,6 @@ static const char *priority_to_string(enum radeon_bo_priority priority)
 	        ITEM(SAMPLER_BUFFER),
 	        ITEM(VERTEX_BUFFER),
 	        ITEM(SHADER_RW_BUFFER),
-	        ITEM(SCRATCH_BUFFER),
 	        ITEM(COMPUTE_GLOBAL),
 	        ITEM(SAMPLER_TEXTURE),
 	        ITEM(SHADER_RW_IMAGE),
@@ -574,6 +573,7 @@ static const char *priority_to_string(enum radeon_bo_priority priority)
 	        ITEM(DCC),
 	        ITEM(HTILE),
 		ITEM(SHADER_RINGS),
+		ITEM(SCRATCH_BUFFER),
 	};
 #undef ITEM