From: Keith Packard <keithp@keithp.com>
Date: Tue, 12 Jul 2011 17:40:25 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9aa73a51c91cb0d0af4caaa9823969c1a1179a12;p=linux-beck.git

Merge branch 'drm-intel-fixes' into drm-intel-next
---

9aa73a51c91cb0d0af4caaa9823969c1a1179a12
diff --cc drivers/gpu/drm/i915/i915_drv.c
index 629d24ca73e2,eb91e2dd7914..6ed73ae2133a
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -52,10 -52,10 +52,10 @@@ module_param_named(powersave, i915_powe
  unsigned int i915_semaphores = 0;
  module_param_named(semaphores, i915_semaphores, int, 0600);
  
- unsigned int i915_enable_rc6 = 1;
+ unsigned int i915_enable_rc6 = 0;
  module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);
  
 -unsigned int i915_enable_fbc = 0;
 +unsigned int i915_enable_fbc = 1;
  module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600);
  
  unsigned int i915_lvds_downclock = 0;