From fd6bbdcf59dc5b87fed31f8fc51a2b27eaedfbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 27 Sep 2020 13:26:01 -0400 Subject: [PATCH] radeonsi: use staging buffer uploads for most VRAM buffers Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_buffer.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index 31f1318542d..cfa98f00209 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -203,8 +203,18 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res, if (res->domains & RADEON_DOMAIN_VRAM) { res->vram_usage = size; + /* We don't want to evict buffers from VRAM by mapping them for CPU access, + * because they might never be moved back again. If a buffer is large enough, + * upload data by copying from a temporary GTT buffer. 8K might not seem much, + * but there can be 100000 buffers. + * + * This tweak improves performance for viewperf. + */ + const unsigned min_size = 8196; /* tuned to minimize mapped VRAM */ + const unsigned max_staging_uploads = 1; /* number of uploads before mapping directly */ + res->max_forced_staging_uploads = res->b.max_forced_staging_uploads = - sscreen->info.has_dedicated_vram && size >= sscreen->info.vram_vis_size / 4 ? 1 : 0; + sscreen->info.has_dedicated_vram && size >= min_size ? max_staging_uploads : 0; } else if (res->domains & RADEON_DOMAIN_GTT) { res->gart_usage = size; }