diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:48 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:48 -0400 |
| commit | 0ca9413c234aa5a49ffaf80e46b50721a752e45a (patch) | |
| tree | 2337ac22810f77c0ddb9b00391feab31175c0bd2 /drivers/misc | |
| parent | acd41d36e5a813501da92156f325ce15ddcd58ff (diff) | |
| parent | d64c81c4cea0a14e88fc76e2c845e4885e491754 (diff) | |
Merge branch 'thinkpad' into test
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 63 |
1 files changed, 61 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 62aebaa8591..4db1cf9078d 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -159,7 +159,6 @@ enum { #define TPACPI_DEBUG KERN_DEBUG TPACPI_LOG #define TPACPI_DBG_ALL 0xffff -#define TPACPI_DBG_ALL 0xffff #define TPACPI_DBG_INIT 0x0001 #define TPACPI_DBG_EXIT 0x0002 #define dbg_printk(a_dbg_level, format, arg...) \ @@ -582,7 +581,8 @@ static int __init register_tpacpi_subdriver(struct ibm_struct *ibm) ibm->acpi->driver = kzalloc(sizeof(struct acpi_driver), GFP_KERNEL); if (!ibm->acpi->driver) { - printk(TPACPI_ERR "kzalloc(ibm->driver) failed\n"); + printk(TPACPI_ERR + "failed to allocate memory for ibm->acpi->driver\n"); return -ENOMEM; } @@ -838,6 +838,13 @@ static int parse_strtoul(const char *buf, return 0; } +static void tpacpi_disable_brightness_delay(void) +{ + if (acpi_evalf(hkey_handle, NULL, "PWMS", "qvd", 0)) + printk(TPACPI_NOTICE + "ACPI backlight control delay disabled\n"); +} + static int __init tpacpi_query_bcl_levels(acpi_handle handle) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; @@ -2139,6 +2146,8 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) if (!tp_features.hotkey) return 1; + tpacpi_disable_brightness_delay(); + hotkey_dev_attributes = create_attr_set(13, NULL); if (!hotkey_dev_attributes) return -ENOMEM; @@ -2512,6 +2521,8 @@ static void hotkey_suspend(pm_message_t state) static void hotkey_resume(void) { + tpacpi_disable_brightness_delay(); + if (hotkey_mask_get()) printk(TPACPI_ERR "error while trying to read hot key mask " @@ -5983,6 +5994,52 @@ static void fan_exit(void) flush_workqueue(tpacpi_wq); } +static void fan_suspend(pm_message_t state) +{ + if (!fan_control_allowed) + return; + + /* Store fan status in cache */ + fan_get_status_safe(NULL); + if (tp_features.fan_ctrl_status_undef) + fan_control_desired_level = TP_EC_FAN_AUTO; +} + +static void fan_resume(void) +{ + u8 saved_fan_level; + u8 current_level = 7; + bool do_set = false; + + /* DSDT *always* updates status on resume */ + tp_features.fan_ctrl_status_undef = 0; + + saved_fan_level = fan_control_desired_level; + if (!fan_control_allowed || + (fan_get_status_safe(¤t_level) < 0)) + return; + + switch (fan_control_access_mode) { + case TPACPI_FAN_WR_ACPI_SFAN: + do_set = (saved_fan_level > current_level); + break; + case TPACPI_FAN_WR_ACPI_FANS: + case TPACPI_FAN_WR_TPEC: + do_set = ((saved_fan_level & TP_EC_FAN_FULLSPEED) || + (saved_fan_level == 7 && + !(current_level & TP_EC_FAN_FULLSPEED))); + break; + default: + return; + } + if (do_set) { + printk(TPACPI_NOTICE + "restoring fan level to 0x%02x\n", + saved_fan_level); + fan_set_level_safe(saved_fan_level); + } +} + static int fan_read(char *p) { int len = 0; @@ -6174,6 +6231,8 @@ static struct ibm_struct fan_driver_data = { .read = fan_read, .write = fan_write, .exit = fan_exit, + .suspend = fan_suspend, + .resume = fan_resume, }; /**************************************************************************** |