Mesa (master): st/nine: enable csmt per default on iris

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 12f11e6fe690b14cf1855fcf183cf16a14718ae8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12f11e6fe690b14cf1855fcf183cf16a14718ae8

Author: Andre Heider <a.heider at gmail.com>
Date:   Wed Mar 20 21:38:40 2019 +0100

st/nine: enable csmt per default on iris

iris is thread safe, enable csmt for a ~5% performace boost.

Signed-off-by: Andre Heider <a.heider at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Axel Davy <davyaxel0 at gmail.com>

---

 src/gallium/state_trackers/nine/device9.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 24c8ce062b3..db1c3a1d23d 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -266,13 +266,15 @@ NineDevice9_ctor( struct NineDevice9 *This,
     }
 
     /* Initialize CSMT */
+    /* r600, radeonsi and iris are thread safe. */
     if (pCTX->csmt_force == 1)
         This->csmt_active = true;
     else if (pCTX->csmt_force == 0)
         This->csmt_active = false;
-    else
-        /* r600 and radeonsi are thread safe. */
-        This->csmt_active = strstr(pScreen->get_name(pScreen), "AMD") != NULL;
+    else if (strstr(pScreen->get_name(pScreen), "AMD") != NULL)
+        This->csmt_active = true;
+    else if (strstr(pScreen->get_name(pScreen), "Intel") != NULL)
+        This->csmt_active = true;
 
     /* We rely on u_upload_mgr using persistent coherent buffers (which don't
      * require flush to work in multi-pipe_context scenario) for vertex and