From fac02592a1ac675c4c1ec1ea763e0a06bdf6b758 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun, 26 Aug 2012 20:33:18 +0200
Subject: [PATCH] --- yaml --- r: 329361 b: refs/heads/master c:
 cd7988eea561a70a4f98e431c1395f913672d626 h: refs/heads/master i:   329359:
 b274d3b620d5574c598394371f02d6fcc9d6bf3e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/intel_pm.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a8db0e8eded..7d0184fef1d0 100644
--- 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
index c0721ffb56a2..ebe3498bc9c0 100644
--- 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;
 	}