Messages in this thread Patch in this message | | | Date | Wed, 19 Mar 2008 21:23:23 +0100 | From | Pavel Machek <> | Subject | Re: suspend slow in 2.6.25-rc6 (was Re: Suspend and hibernation patchset against -rc6) |
| |
Hi!
> > Ok, 7c0... is innocent. Reverting not only the mdelay, but also rest > > of drivers/acpi/ec.c patch fixed the > > "rc6-breaks-backlight-in-X-over-lid-close", good. > > Can you clarify a bit? > > Do you mean that the full revert of 2c81ce4 that already got committed is > sufficient for you, or do you need to totally undo everything we've done > to ec.c since -rc5, and thus also to revert the _other_ revert we did (in > 4af8e10a6c57e7292862bd1703712f0565c7e429)?
I did some more testing, and realized I was wrong. We need to totally undo everything we've done to ec.c since -rc5... (that has small sideffect of brightness up/down keys no longer working -- regression since 2.6.24, but saves us from "backlight gone after closing/reopening lid" which is _NASTY_ regression from 2.6.25-rc5).
ACPI sucks.
I.e. this patch:
Revert ec.c to 2.6.25-rc5 state:
* this fixes backlight after closing/reopening the lid while in X on thinkpad x60
* unfortunately it breaks fn-home/end keyboard brightness control
Signed-off-by: Pavel Machek <pavel@suse.cz>
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 7222a18..caf873c 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -943,7 +943,11 @@ int __init acpi_ec_ecdt_probe(void) boot_ec->command_addr = ecdt_ptr->control.address; boot_ec->data_addr = ecdt_ptr->data.address; boot_ec->gpe = ecdt_ptr->gpe; - boot_ec->handle = ACPI_ROOT_OBJECT; + if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id, + &boot_ec->handle))) { + pr_info("Failed to locate handle for boot EC\n"); + boot_ec->handle = ACPI_ROOT_OBJECT; + } } else { /* This workaround is needed only on some broken machines, * which require early EC, but fail to provide ECDT */ Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html pomozte zachranit klanovicky les: http://www.ujezdskystrom.info/
| |