From 341b55da09a53f26c9bf78d3cf20b84c1d627e1c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Dec 2011 17:02:10 -0800
Subject: [PATCH] --- yaml --- r: 277024 b: refs/heads/master c:
 ebbd857e6b9a92c0aff4aacd1b1d2361d888633e h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2a454d8b1ad2..e5a7b63d3472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f54492fbca0074d7db117d7972a80347e0b40a5
+refs/heads/master: ebbd857e6b9a92c0aff4aacd1b1d2361d888633e
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index c681dc149d2a..b9da8900ae4e 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -756,9 +756,9 @@ intel_enable_semaphores(struct drm_device *dev)
 	if (i915_semaphores >= 0)
 		return i915_semaphores;
 
-	/* Enable semaphores on SNB when IO remapping is off */
+	/* Disable semaphores on SNB */
 	if (INTEL_INFO(dev)->gen == 6)
-		return !intel_iommu_enabled;
+		return 0;
 
 	return 1;
 }