diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-12 10:40:25 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-12 10:40:25 -0700 |
| commit | 9aa73a51c91cb0d0af4caaa9823969c1a1179a12 (patch) | |
| tree | 4a7b4fa5f2b9915154fbd9cc678d279026071909 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | c7c369472dad852f6fe06a8be94dea72de784934 (diff) | |
| parent | a94919eaddaa3fede1df8563ce4d761a75374645 (diff) | |
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.c | 2 |
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 629d24ca73e..6ed73ae2133 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; |