From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 9 Jun 2018 01:48:23 +0000 (-0400)
Subject: radeonsi: always put persistent buffers into GTT on radeon
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9322974ec716b8c3b2e326559f663ff087daa38c;p=mesa.git

radeonsi: always put persistent buffers into GTT on radeon

This improves performance for certain games.

Cc: 18.1 <mesa-stable@lists.freedesktop.org>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
index 2d68edc3404..0546fa9d336 100644
--- a/src/gallium/drivers/radeonsi/si_buffer.c
+++ b/src/gallium/drivers/radeonsi/si_buffer.c
@@ -151,8 +151,12 @@ void si_init_resource_fields(struct si_screen *sscreen,
 		 * Write-combined CPU mappings are fine, the kernel
 		 * ensures all CPU writes finish before the GPU
 		 * executes a command stream.
+		 *
+		 * radeon doesn't have good BO move throttling, so put all
+		 * persistent buffers into GTT to prevent VRAM CPU page faults.
 		 */
-		if (!sscreen->info.kernel_flushes_hdp_before_ib)
+		if (!sscreen->info.kernel_flushes_hdp_before_ib ||
+		    sscreen->info.drm_major == 2)
 			res->domains = RADEON_DOMAIN_GTT;
 	}