From 75a32e3290ee078aa7b7a6fb53801413e9f9708a Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Fri, 13 Apr 2012 17:08:54 -0300
Subject: [PATCH] --- yaml --- r: 307173 b: refs/heads/master c:
 83de97c885b633ab6d12346a406911fadeb85f8c h: refs/heads/master i:   307171:
 b7eedc129227f539b8fe70b468c64c91917f9314 v: v3

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

diff --git a/[refs] b/[refs]
index 054511c71de4..40a8fdc90187 100644
--- 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
index c67eb7784aa8..02e9932c3774 100644
--- 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
 	 */