---

yaml --- r: 277024 b: refs/heads/master c: ebbd857 h: refs/heads/master v: v3
git-mirror · Dec 27, 2011 · 341b55d · 341b55d
1 parent 052297a
commit 341b55d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 }