Android: generate symlinks for all enabled gallium drivers

[mesa.git] / src / gallium / drivers / radeon / r600_buffer_common.c

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index 262fe1db836df4efb57ae1d51713ae0a18b39484..40d763bd9f5a272089e27cc76db5ce1777130a11 100644 (file)
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -176,12 +176,17 @@ void r600_init_resource_fields(struct r600_common_screen *rscreen,
         */
        if (!rscreen->info.has_dedicated_vram &&
            (rscreen->info.drm_major < 3 || rscreen->info.drm_minor < 6) &&
-           res->domains == RADEON_DOMAIN_VRAM)
+           res->domains == RADEON_DOMAIN_VRAM) {
                res->domains = RADEON_DOMAIN_VRAM_GTT;
+               res->flags &= ~RADEON_FLAG_NO_CPU_ACCESS; /* disallowed with VRAM_GTT */
+       }
 
        if (rscreen->debug_flags & DBG_NO_WC)
                res->flags &= ~RADEON_FLAG_GTT_WC;
 
+       if (res->b.b.bind & PIPE_BIND_SHARED)
+               res->flags |= RADEON_FLAG_NO_SUBALLOC;
+
        /* Set expected VRAM and GART usage for the buffer. */
        res->vram_usage = 0;
        res->gart_usage = 0;