Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756840AbXFOOyu (ORCPT ); Fri, 15 Jun 2007 10:54:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754072AbXFOOyi (ORCPT ); Fri, 15 Jun 2007 10:54:38 -0400 Received: from wx-out-0506.google.com ([66.249.82.228]:39048 "EHLO wx-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754495AbXFOOyg (ORCPT ); Fri, 15 Jun 2007 10:54:36 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer; b=dDGIK3TAB7zhELDQcU7ya2SDUOORnBINo8geWkREDsBeVBrZ8tbBIu0I9whxvtzyHfYbxqHRRzHfcN0xxYj5Nut1reFeFQScid7vX9PyNReSCE+nu5i6M6db9I1+NaVQms7zczV7l2i9YUvBmJfEsrA4LcDCnrNH9eslFHdN5QA= Subject: Re: [patch] Reporting the lid status using INPUT From: Richard Hughes To: Dmitry Torokhov Cc: linux-acpi , a_bartok@freemail.hu, Bastien Nocera , David Zeuthen , linux-kernel In-Reply-To: References: <1181910567.4819.7.camel@work> <1181913179.21041.3.camel@work> Content-Type: multipart/mixed; boundary="=-7TGIuZmkkPPhMJFtmkRr" Date: Fri, 15 Jun 2007 15:53:28 +0100 Message-Id: <1181919208.2681.6.camel@work> Mime-Version: 1.0 X-Mailer: Evolution 2.10.2 (2.10.2-2.fc7) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3595 Lines: 108 --=-7TGIuZmkkPPhMJFtmkRr Content-Type: text/plain Content-Transfer-Encoding: 7bit On Fri, 2007-06-15 at 10:29 -0400, Dmitry Torokhov wrote: > On 6/15/07, Richard Hughes wrote: > > On Fri, 2007-06-15 at 13:29 +0100, Richard Hughes wrote: > > > in response to an event, but I'm thinking in a resume hook we should > > > probably do acpi_evaluate_integer(handle, "_LID", NULL, &state) and then > > > send an event, just so userspace is aware of what the state of the panel > > > is. > > > > Attached patch fixed the issue for me. Comments? > > > > The patch makes perfect sense. The only issue I have is this: > > > + /* on resume we send the state; it might be the same, but userspace > > + * should handle duplicated events */ > > If switch state matches to what input layer thinks it is the event > will not even reach userspace. Okay, new patch attached, thanks for the speedy review. Signed-off-by: Richard Hughes --=-7TGIuZmkkPPhMJFtmkRr Content-Disposition: attachment; filename=button-resume.patch Content-Type: message/rfc822; name=button-resume.patch From: Richard Hughes Date: Fri, 15 Jun 2007 15:53:11 +0100 Subject: No Subject Message-Id: <1181919191.2681.5.camel@work> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit On resume we need to refresh the lid status as we will not get an event if the lid opening was what triggered the suspend. This manifests itself in users never getting a "lid open" event when a suspend happens because of lid close on hardware that supports wake on lid open. This makes userspace gets very confused indeed. Patch attached forces a check of the lid status in the resume handler. Signed-off-by: Richard Hughes --- diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index cb4110b..fd3473b 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -68,6 +68,7 @@ MODULE_LICENSE("GPL"); static int acpi_button_add(struct acpi_device *device); static int acpi_button_remove(struct acpi_device *device, int type); +static int acpi_button_resume(struct acpi_device *device); static int acpi_button_info_open_fs(struct inode *inode, struct file *file); static int acpi_button_state_open_fs(struct inode *inode, struct file *file); @@ -77,6 +78,7 @@ static struct acpi_driver acpi_button_driver = { .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", .ops = { .add = acpi_button_add, + .resume = acpi_button_resume, .remove = acpi_button_remove, }, }; @@ -487,6 +489,29 @@ static int acpi_button_remove(struct acpi_device *device, int type) return 0; } +/* this is needed to learn about changes made in suspended state */ +static int acpi_button_resume(struct acpi_device *device) +{ + struct acpi_button *button; + struct acpi_handle *handle; + struct input_dev *input; + unsigned long state; + + button = device->driver_data; + handle = button->device->handle; + input = button->input; + + /* + * On resume we send the state; if it matches to what input layer + * thinks then the event will not even reach userspace. + */ + if (!ACPI_FAILURE(acpi_evaluate_integer(handle, "_LID", + NULL, &state))) + input_report_switch(input, SW_LID, !state); + + return 0; +} + static int __init acpi_button_init(void) { int result; --=-7TGIuZmkkPPhMJFtmkRr-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/