r600g/radeonsi: Prefer VRAM for CPU -> GPU streaming buffers

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index 154c33d73910700f748eb25c7791a8b995054655..d747cbcb930f75d9c76f5cf900066fee98562a8d 100644 (file)
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -110,14 +110,21 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
        enum radeon_bo_flag flags = 0;
 
        switch (res->b.b.usage) {
-       case PIPE_USAGE_DYNAMIC:
-       case PIPE_USAGE_STREAM:
-               flags = RADEON_FLAG_GTT_WC;
-               /* fall through */
        case PIPE_USAGE_STAGING:
                /* Transfers are likely to occur more often with these resources. */
                res->domains = RADEON_DOMAIN_GTT;
                break;
+       case PIPE_USAGE_STREAM:
+       case PIPE_USAGE_DYNAMIC:
+               /* Older kernels didn't always flush the HDP cache before
+                * CS execution
+                */
+               if (rscreen->info.drm_minor < 40) {
+                       res->domains = RADEON_DOMAIN_GTT;
+                       flags = RADEON_FLAG_GTT_WC;
+                       break;
+               }
+               /* fall through */
        case PIPE_USAGE_DEFAULT:
        case PIPE_USAGE_IMMUTABLE:
        default: