diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 10:53:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-02 10:53:29 +0000 |
| commit | 8c1812ad4879676bec1bd20f8ff478c8a076f3fc (patch) | |
| tree | 71460f036f5ed4c1c130c041b0db95f12213baa4 /drivers/gpu/drm/i915/i915_drv.c | |
| parent | 8d19215be8254f4f75e9c5a0d28345947b0382db (diff) | |
| parent | 5588978882b5f4b81169bd7f9bc941e3a12ee8ba (diff) | |
| download | blackbird-op-linux-8c1812ad4879676bec1bd20f8ff478c8a076f3fc.tar.gz blackbird-op-linux-8c1812ad4879676bec1bd20f8ff478c8a076f3fc.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Immediate merge to resolve conflicts from applying a stability fix to
both branches.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h
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 d22aab94d645..57e892d484ad 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -44,7 +44,7 @@ unsigned int i915_fbpercrtc = 0; module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400); unsigned int i915_powersave = 1; -module_param_named(powersave, i915_powersave, int, 0400); +module_param_named(powersave, i915_powersave, int, 0600); unsigned int i915_lvds_downclock = 0; module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400); |
