From 6c9f2959a36e608e4d1f71230a9eaaa77940c54e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Oct 2008 03:23:25 +0200 Subject: Reset acpi_video_flags before suspend. If no --quirk-s3-* option is passed to pm-suspend, set acpi_video_flags to 0. This allows to reliably test different set of quirks and clears any flags that were set via the kernel boot option. We deliberately ignore the kernel acpi_sleep option, quirks should be set via HAL. --- pm/sleep.d/99video | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pm') diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video index 0beb360..1fe54c2 100755 --- a/pm/sleep.d/99video +++ b/pm/sleep.d/99video @@ -144,7 +144,7 @@ suspend_video() local acpi_flag=0 quirk "${QUIRK_S3_BIOS}" && acpi_flag=$(($acpi_flag + 1)) quirk "${QUIRK_S3_MODE}" && acpi_flag=$(($acpi_flag + 2)) - [ 0 -ne $acpi_flag ] && sysctl -w kernel.acpi_video_flags=$acpi_flag + sysctl -w kernel.acpi_video_flags=$acpi_flag quirk "${QUIRK_NOFB}" && die_if_framebuffer quirk "${QUIRK_VBESTATE_RESTORE}" && vbe_savestate @@ -166,8 +166,6 @@ resume_video() quirk "${QUIRK_RADEON_OFF}" && radeon_on quirk "${QUIRK_DPMS_ON}" && vbe dpms on quirk "${QUIRK_RESET_BRIGHTNESS}" && reset_brightness - # always reset acpi_video_flag -- makes quirk testing more reliable. - sysctl -w kernel.acpi_video_flags=0 return 0 # avoid spurious hook exit failure message. } -- cgit v1.2.3