From: Hans de Goede <hdegoede@redhat.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>, linux-input@vger.kernel.org
Subject: [PATCH 3/3] HID: multitouch: Disable event reporting on suspend when our parent is not a wakeup-source
Date: Sat, 6 Mar 2021 14:37:16 +0100 [thread overview]
Message-ID: <20210306133716.453447-3-hdegoede@redhat.com> (raw)
In-Reply-To: <20210306133716.453447-1-hdegoede@redhat.com>
Disable event reporting on suspend when our parent is not
a wakeup-source. This should help save some extra power in
this case.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/hid/Kconfig | 2 +-
drivers/hid/hid-multitouch.c | 23 ++++++++++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 786b71ef7738..5cbe4adfd816 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -675,7 +675,7 @@ config HID_MONTEREY
config HID_MULTITOUCH
tristate "HID Multitouch panels"
- depends on HID
+ depends on USB_HID
help
Generic support for HID multitouch panels.
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index cfb68e443ddd..7926295bab81 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1759,12 +1759,33 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
}
#ifdef CONFIG_PM
+
+/* Check if the parent which has the power/wakeup* sysfs attributes may wake the hdev */
+static bool mt_parent_may_wake(struct hid_device *hdev)
+{
+ struct device *parent = hdev->dev.parent;
+
+ /*
+ * USB-HID is attached to the usb_interface (our parent), the
+ * power/wakeup* attr are part of the usb-device which is its parent.
+ */
+ if (hid_is_using_ll_driver(hdev, &usb_hid_driver) && parent)
+ parent = parent->parent;
+
+ if (parent)
+ return device_may_wakeup(parent);
+
+ /* Huh? Play it safe and keep reporting events. */
+ return true;
+}
+
static int mt_suspend(struct hid_device *hdev, pm_message_t state)
{
struct mt_device *td = hid_get_drvdata(hdev);
/* High latency is desirable for power savings during S3/S0ix */
- if (td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP)
+ if ((td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP) ||
+ !mt_parent_may_wake(hdev))
mt_set_modes(hdev, HID_LATENCY_HIGH, false, false);
else
mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);
--
2.30.1
next prev parent reply other threads:[~2021-03-06 13:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 13:37 [PATCH 1/3] HID: asus: Cleanup Asus T101HA keyboard-dock handling Hans de Goede
2021-03-06 13:37 ` [PATCH 2/3] HID: multitouch: Disable event reporting on suspend on the Asus T101HA touchpad Hans de Goede
2021-05-13 10:34 ` Jiri Kosina
2021-03-06 13:37 ` Hans de Goede [this message]
2021-05-05 13:40 ` [PATCH 3/3] HID: multitouch: Disable event reporting on suspend when our parent is not a wakeup-source Benjamin Tissoires
2021-05-05 13:59 ` Hans de Goede
2021-05-05 14:09 ` Benjamin Tissoires
2021-03-31 9:41 ` [PATCH 1/3] HID: asus: Cleanup Asus T101HA keyboard-dock handling Jiri Kosina
2021-05-05 12:24 ` Jiri Kosina
2021-05-05 13:36 ` Benjamin Tissoires
2021-05-13 10:33 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210306133716.453447-3-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=benjamin.tissoires@redhat.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).