---

yaml --- r: 307173 b: refs/heads/master c: 83de97c h: refs/heads/master i: 307171: b7eedc1 v: v3
git-mirror · Apr 17, 2012 · 75a32e3 · 75a32e3
1 parent 7873f22
commit 75a32e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cd83aa9a6aba8fec7d94d4fd5302172e14cebf7
+refs/heads/master: 83de97c885b633ab6d12346a406911fadeb85f8c
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8585,6 +8585,10 @@ int intel_enable_rc6(const struct drm_device *dev)
 	if (INTEL_INFO(dev)->gen == 5)
 		return 0;
 
+	/* Sorry Haswell, no RC6 for you for now. */
+	if (IS_HASWELL(dev))
+		return 0;
+
 	/*
 	 * Disable rc6 on Sandybridge
 	 */