summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-07-12 19:40:25 +0200
committerKeith Packard <keithp@keithp.com>2011-07-12 19:40:25 +0200
commit9aa73a51c91cb0d0af4caaa9823969c1a1179a12 (patch)
tree4a7b4fa5f2b9915154fbd9cc678d279026071909 /drivers/gpu/drm/i915/i915_drv.c
parentdrm/i915: Enable i915 frame buffer compression by default (diff)
parentdrm/i915/ringbuffer: Idling requires waiting for the ring to be empty (diff)
downloadlinux-9aa73a51c91cb0d0af4caaa9823969c1a1179a12.tar.xz
linux-9aa73a51c91cb0d0af4caaa9823969c1a1179a12.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 629d24ca73e2..6ed73ae2133a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -52,7 +52,7 @@ module_param_named(powersave, i915_powersave, int, 0600);
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 = 1;