diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 08:11:42 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 08:11:42 -0600 |
| commit | faa4c5d24da753010f033561a02b4e7499b79eb3 (patch) | |
| tree | d5ecfd8405e87f197e9daa9b1e8470036656e0fa | |
| parent | fba432cae9b7cba19e2d9dad0b11417ad9d6f717 (diff) | |
Rearrange quirk handling to bring it in line with s2ram.
| -rwxr-xr-x | pm/sleep.d/99video | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video index ac73051..e53c1dc 100755 --- a/pm/sleep.d/99video +++ b/pm/sleep.d/99video @@ -59,30 +59,27 @@ suspend_video() sysctl -w kernel.acpi_video_flags=$acpi_flag # We might need to do one or many of these quirks - if [ "${DISPLAY_QUIRK_RADEON_OFF}" = "true" ]; then - radeon dac off - radeon light off - fi if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" = "true" ]; then vbe vbestate save |savestate vbestate fi if [ "${DISPLAY_QUIRK_VBEMODE_RESTORE}" = "true" ]; then vbe vbemode get |savestate vbemode fi + if [ "${DISPLAY_QUIRK_RADEON_OFF}" = "true" ]; then + radeon dac off + radeon light off + fi if [ "${DISPLAY_QUIRK_VGA_MODE_3}" = "true" ]; then vbe vbemode set 3 fi if [ "${DISPLAY_QUIRK_DPMS_SUSPEND}" = "true" ]; then vbe dpms suspend fi + save_fbcon } resume_video() { - if [ "${DISPLAY_QUIRK_RADEON_OFF}" = "true" ]; then - radeon dac on - radeon light on - fi - # We might need to do one or many of these quirks + # We might need to do one or many of these quirks if [ "${DISPLAY_QUIRK_VBE_POST}" = "true" ]; then vbe post sleep 0.1 @@ -95,6 +92,10 @@ resume_video() fi # based on data from s2ram resume_fbcon + if [ "${DISPLAY_QUIRK_RADEON_OFF}" = "true" ]; then + radeon dac on + radeon light on + fi if [ "${DISPLAY_QUIRK_DPMS_ON}" = "true" ]; then vbe dpms on fi @@ -107,7 +108,6 @@ resume_video() case "$1" in suspend) suspend_video - save_fbcon ;; hibernate) if [ "$HIBERNATE_RESUME_POST_VIDEO" = "yes" ]; then |