xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 4b5060f357a3cb248c9359c92c1e9c42ef6434c8
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jun 19 18:27:59 2014 +0900

    glamor: Set environment variable RADEON_THREAD=0
    
    Reviewed-by: Marek Olšák <marek.olsak at amd.com>

diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index 210ddcf..02fa658 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -132,6 +132,16 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 			"Incompatible glamor version, required >= 0.3.0.\n");
 			return FALSE;
 		} else {
+			/* This prevents the Gallium radeon winsys from spawning
+			 * a separate thread for submitting command streams to
+			 * the kernel. Improves scores of at least gtkperf and
+			 * x11perf -putimage/-shmput/-getimage/-shmget, probably
+			 * because glamor causes too many command stream flushes
+			 * / too much synchronization with pending command
+			 * streams for the separate thread to pay off.
+			 */
+			setenv("RADEON_THREAD", "0", 0);
+
 			if (glamor_egl_init(scrn, info->dri2.drm_fd)) {
 				xf86DrvMsg(scrn->scrnIndex, X_INFO,
 					   "glamor detected, initialising EGL layer.\n");