Messages in this thread Patch in this message | | | Date | Thu, 15 Dec 2005 14:16:01 -0700 | From | "Jordan Crouse" <> | Subject | [PATCH 3/3] APM Screen Blanking fix |
| |
A simple patch to fix APM assisted screen blanking (this at least fixes a issue with the Geode LX BIOS). Reposted from before with no changes.
APM screen blanking fix.
This patch fixes screen blanking on BIOSes that return APM_NOT_ENGAGED when APM enabled screen blanking is not turned on.
Signed off by: Jordan Crouse <jordan.crouse@amd.com> ---
arch/i386/kernel/apm.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 1e60acb..03e9d84 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c @@ -1075,22 +1075,23 @@ static int apm_engage_power_management(u static int apm_console_blank(int blank) { - int error; - u_short state; + int error, i; + u_short state; + u_short dev[3] = { 0x100, 0x1FF, 0x101 }; state = blank ? APM_STATE_STANDBY : APM_STATE_READY; - /* Blank the first display device */ - error = set_power_state(0x100, state); - if ((error != APM_SUCCESS) && (error != APM_NO_ERROR)) { - /* try to blank them all instead */ - error = set_power_state(0x1ff, state); - if ((error != APM_SUCCESS) && (error != APM_NO_ERROR)) - /* try to blank device one instead */ - error = set_power_state(0x101, state); + + for (i = 0; i < 3; i++) { + error = set_power_state(dev[i], state); + + if ((error == APM_SUCCESS) || (error == APM_NO_ERROR)) + return 1; + + if (error == APM_NOT_ENGAGED) + break; } - if ((error == APM_SUCCESS) || (error == APM_NO_ERROR)) - return 1; - if (error == APM_NOT_ENGAGED) { + + if (error == APM_NOT_ENGAGED && state != APM_STATE_READY) { static int tried; int eng_error; if (tried++ == 0) { | |