From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 24 Nov 2017 21:08:03 +0000 (+0100)
Subject: radeonsi: always initialize max_forced_staging_uploads
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5444877c0820b7848c07d1bc4e9a706f90894a5;p=mesa.git

radeonsi: always initialize max_forced_staging_uploads

r600_resource is malloc'd.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103808
Fixes: 4b0dc098b256 ("gallium/u_threaded: don't map big VRAM buffers for the first upload directly")

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index 770f4e980fd..3e476f745c0 100644
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -190,6 +190,8 @@ void si_init_resource_fields(struct r600_common_screen *rscreen,
 	/* Set expected VRAM and GART usage for the buffer. */
 	res->vram_usage = 0;
 	res->gart_usage = 0;
+	res->max_forced_staging_uploads = 0;
+	res->b.max_forced_staging_uploads = 0;
 
 	if (res->domains & RADEON_DOMAIN_VRAM) {
 		res->vram_usage = size;