CHROMIUM: i915: disable GPU RC6 on ivybridge boards

The BIOS are not updated yet and some boards have still issues.

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=None
TEST=boot kernel 3.4 on Link Proto-1.

Change-Id: I40490e5acbc85e2b4cd239faa098d2e1cf0b5c7f
Reviewed-on: https://gerrit.chromium.org/gerrit/24546
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 6f83c46..76f5d7a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8269,6 +8269,13 @@ 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
         */