---

yaml --- r: 318645 b: refs/heads/master c: 4a637c2 h: refs/heads/master i: 318643: ad89b94 v: v3
git-mirror · Jul 5, 2012 · 2462899 · 2462899
1 parent da81b1f
commit 2462899
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cf50fc8d7a491d9aa47e1a0262ed7d265f2bec3
+refs/heads/master: 4a637c2c83a26f496688a28e629a3c0acb8a7be5
diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c
@@ -2334,9 +2334,11 @@ 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. */
+	/* On Haswell, only RC6 is available. So let's enable it by default to
+	 * provide better testing and coverage since the beginning.
+	 */
 	if (IS_HASWELL(dev))
-		return 0;
+		return INTEL_RC6_ENABLE;
 
 	/*
 	 * Disable rc6 on Sandybridge