---

yaml --- r: 329361 b: refs/heads/master c: cd7988e h: refs/heads/master i: 329359: b274d3b v: v3
git-mirror · Aug 26, 2012 · fac0259 · fac0259
1 parent 9ea3d8e
commit fac0259
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7788a765205f63abcb8645c16c85a968bd578f4f
+refs/heads/master: cd7988eea561a70a4f98e431c1395f913672d626
diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c
@@ -2372,6 +2372,11 @@ int intel_enable_rc6(const struct drm_device *dev)
 		return i915_enable_rc6;
 
 	if (INTEL_INFO(dev)->gen == 5) {
+#ifdef CONFIG_INTEL_IOMMU
+		/* Disable rc6 on ilk if VT-d is on. */
+		if (intel_iommu_gfx_mapped)
+			return false;
+#endif
 		DRM_DEBUG_DRIVER("Ironlake: only RC6 available\n");
 		return INTEL_RC6_ENABLE;
 	}