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

just FYI, the kernel receives priority/4

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

diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
index 8a98ebf69c46e541a20e094dc737ed4665c5ef84..c65b9a4a3d4c99086e92afe1a54aafdf870c5c8a 100644 (file)
--- 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 be300ac5b184a226a1f2381227f3c6326c4198a8..a52dfe4e732578b5baf53008a68827b1a5c82dd6 100644 (file)
--- 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