From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 11 May 2011 14:54:57 +0000 (-0700)
Subject: i965: Avoid register coalescing away MATH workarounds on Ivybridge.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a95568f64a6641a49a2d4855272e9be2ac2db6d;p=mesa.git

i965: Avoid register coalescing away MATH workarounds on Ivybridge.

The MATH instruction cannot handle source modifiers, even on Gen7.
So, apply this workaround for Sandybridge on Ivybridge as well.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 8dee849edd4..1b0e7e82fbe 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3386,7 +3386,7 @@ fs_visitor::register_coalesce()
 	 /* The gen6 MATH instruction can't handle source modifiers, so avoid
 	  * coalescing those for now.  We should do something more specific.
 	  */
-	 if (intel->gen == 6 && scan_inst->is_math() && has_source_modifiers) {
+	 if (intel->gen >= 6 && scan_inst->is_math() && has_source_modifiers) {
 	    interfered = true;
 	    break;
 	 }