gallium/radeon: don't use temporary buffers for persistent mappings

Cc: 11.1 11.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index b384baa923726294fad9bec8439a66e6b44de18f..81409ced8273c157bacfa2a996e826fdcbc1c46a 100644 (file)
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -314,7 +314,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx,
                }
        }
        else if ((usage & PIPE_TRANSFER_DISCARD_RANGE) &&
-                !(usage & PIPE_TRANSFER_UNSYNCHRONIZED) &&
+                !(usage & (PIPE_TRANSFER_UNSYNCHRONIZED |
+                           PIPE_TRANSFER_PERSISTENT)) &&
                 !(rscreen->debug_flags & DBG_NO_DISCARD_RANGE) &&
                 r600_can_dma_copy_buffer(rctx, box->x, 0, box->width)) {
                assert(usage & PIPE_TRANSFER_WRITE);
@@ -341,7 +342,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx,
        }
        /* Using a staging buffer in GTT for larger reads is much faster. */
        else if ((usage & PIPE_TRANSFER_READ) &&
-                !(usage & PIPE_TRANSFER_WRITE) &&
+                !(usage & (PIPE_TRANSFER_WRITE |
+                           PIPE_TRANSFER_PERSISTENT)) &&
                 rbuffer->domains == RADEON_DOMAIN_VRAM &&
                 r600_can_dma_copy_buffer(rctx, 0, box->x, box->width)) {
                struct r600_resource *staging;