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

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
index 629d24ca73e28e6b357df32f8e147b619fc0a27e,eb91e2dd791495ed5f40575a4f2190a0b8ad276c..6ed73ae2133a13c68fda9151c0f6bd78b87e5666
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/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;