diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2009-11-12 21:26:22 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2009-11-12 21:26:22 -0600 |
| commit | 067ab317cee676d523d1954d1aeb04a6cc8df139 (patch) | |
| tree | ba0f8eeffdc84bb008e31fa81edfde30dd23316a /pm | |
| parent | 898b46860ad7aa509098e3e454e30c2f3d7b4dea (diff) | |
Add back have_smart_intel
We still need to consider the case where i915 is used with modesetting
disabled. So revert the have_smart_intel removal in
504faf0a0c31cbdbc03a608cf633d58f12e49eb7. Thanks, mbiebl!
Diffstat (limited to 'pm')
| -rwxr-xr-x | pm/sleep.d/98smart-kernel-video | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/pm/sleep.d/98smart-kernel-video b/pm/sleep.d/98smart-kernel-video index 11b5490..c693dbe 100755 --- a/pm/sleep.d/98smart-kernel-video +++ b/pm/sleep.d/98smart-kernel-video @@ -54,9 +54,30 @@ have_fglrx() remove_all_video_quirks } +have_smart_intel() +{ + # currently, intel kernel modesetting is not quite smart enough + # we still need acpi s3 kernel modesetting hooks, so don't remove those + # options if they were passed. + [ -d /sys/module/i915 ] || return 1 + local kernel_rev="$(uname -r |awk -F '[_-]' '{print $1}')" + [ "$kernel_rev" \> "2.6.26" -o "$kernel_rev" = "2.6.26" ] || return 1 + remove_parameters --quirk-dpms-on \ + --quirk-dpms-suspend \ + --quirk-vbe-post \ + --quirk-vbe-post \ + --quirk-vga-mode3 \ + --quirk-vbemode-restore \ + --quirk-vbestate-restore \ + --quirk-reset-brightness \ + --quirk-radeon-off \ + --quirk-no-fb \ + --quirk-pci-save +} + smart_kernel_video() { - have_kms || have_nvidia || have_fglrx || return $NA + have_kms || have_nvidia || have_fglrx || have_smart_intel || return $NA } case $1 in |