From: Sameer Nanda <snanda@chromium.org>
Date: Mon, 9 Jul 2012 16:25:26 +0000 (-0700)
Subject: Revert "CHROMIUM: i915: disable GPU RC6 on ivybridge boards"
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=0a92a97c3ca37ac54c79e023daa56fb4a053703f;p=cascardo%2Flinux.git

Revert "CHROMIUM: i915: disable GPU RC6 on ivybridge boards"

This reverts commit 7e5e38687f0582f3356fe148e77418a3027d8fe7

Change-Id: I1e5b4a6688620487108bdf6bfd429ef65c709c69
Reviewed-on: https://gerrit.chromium.org/gerrit/26923
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Sameer Nanda <snanda@chromium.org>
Tested-by: Sameer Nanda <snanda@chromium.org>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 00d53e4c6095..c482e9dfa773 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8269,13 +8269,6 @@ void intel_init_emon(struct drm_device *dev)
 
 static int intel_enable_rc6(struct drm_device *dev)
 {
-	/*
-	 * Disable rc6 on ivybridge
-	 * until all our HW/BIOS combinations work.
-	 */
-	if (INTEL_INFO(dev)->gen == 7)
-		return 0;
-
 	/*
 	 * Respect the kernel parameter if it is set
 	 */