Skip to content

Commit

Permalink
Merge branch 'for-5.12/multitouch' into for-linus
Browse files Browse the repository at this point in the history
- hid-multitouch devices should be put into high-latency mode when
  suspended in order to be in line with Windows Precision Touchpad
  guidelines. From Blaž Hrastnik.
  • Loading branch information
Jiri Kosina committed Feb 23, 2021
2 parents fc590a3 + c7aa374 commit 31d31fa
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/hid/hid-multitouch.c
Original file line number Diff line number Diff line change
Expand Up @@ -1747,6 +1747,13 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
}

#ifdef CONFIG_PM
static int mt_suspend(struct hid_device *hdev, pm_message_t state)
{
/* High latency is desirable for power savings during S3/S0ix */
mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);
return 0;
}

static int mt_reset_resume(struct hid_device *hdev)
{
mt_release_contacts(hdev);
Expand All @@ -1762,6 +1769,8 @@ static int mt_resume(struct hid_device *hdev)

hid_hw_idle(hdev, 0, 0, HID_REQ_SET_IDLE);

mt_set_modes(hdev, HID_LATENCY_NORMAL, true, true);

return 0;
}
#endif
Expand Down Expand Up @@ -2155,6 +2164,7 @@ static struct hid_driver mt_driver = {
.event = mt_event,
.report = mt_report,
#ifdef CONFIG_PM
.suspend = mt_suspend,
.reset_resume = mt_reset_resume,
.resume = mt_resume,
#endif
Expand Down

0 comments on commit 31d31fa

Please sign in to comment.