From: Rafael Antognolli <rafael.antognolli@intel.com>
Date: Thu, 25 Jan 2018 00:33:58 +0000 (-0800)
Subject: i965/gen10: Re-enable push constants.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bcfd78e4489f538e34138269650fc6cbe8c9d75f;p=mesa.git

i965/gen10: Re-enable push constants.

The GPU hang caused by push constants is apparently fixed, so let's
enable them again.

Signed-off-by: Rafael Antognolli <rafael.antognolli@intel.com>
Cc: "18.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 09adcbc2df1..6fb46e7374c 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -2096,15 +2096,6 @@ fs_visitor::assign_constant_locations()
    if (subgroup_id_index >= 0)
       max_push_components--; /* Save a slot for the thread ID */
 
-   /* FIXME: We currently have some GPU hangs that happen apparently when using
-    * push constants. Since we have no solution for such hangs yet, just
-    * go ahead and use pull constants for now.
-    */
-   if (devinfo->gen == 10 && compiler->supports_pull_constants) {
-      compiler->shader_perf_log(log_data, "Disabling push constants.");
-      max_push_components = 0;
-   }
-
    /* We push small arrays, but no bigger than 16 floats.  This is big enough
     * for a vec4 but hopefully not large enough to push out other stuff.  We
     * should probably use a better heuristic at some point.