Function hid_haptic_switch_mode() can be used to turn off and on the
autonomoums mode for the device. If the device is a forcepad andsupports
press and release waveforms, let the kernel handle generation of haptic
feedback instead of the device itself.
Implement hid_haptic_resume() and hid_haptic_suspend() so that the
autonomous mode gets switched off at resume and switched on at suspend.
Signed-off-by: Angela Czubak <acz@xxxxxxxxxxxx>
---
drivers/hid/hid-haptic.c | 92 +++++++++++++++++++++++++++++++++++++---
drivers/hid/hid-haptic.h | 10 +++++
2 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/drivers/hid/hid-haptic.c b/drivers/hid/hid-haptic.c
index 9b89a1f8a631..3d26bd5d15a4 100644
--- a/drivers/hid/hid-haptic.c
+++ b/drivers/hid/hid-haptic.c
@@ -5,6 +5,7 @@
* Copyright (c) 2021 Angela Czubak <acz@xxxxxxxxxxxx>
*/
+#include <linux/input/mt.h>
#include <linux/module.h>
#include "hid-haptic.h"
@@ -192,9 +193,60 @@ static void fill_effect_buf(struct hid_haptic_device *haptic,
mutex_unlock(&haptic->manual_trigger_mutex);
}
+static void switch_mode(struct hid_device *hdev, struct hid_haptic_device *haptic,
+ int mode)
+{
+ struct hid_report *rep = haptic->auto_trigger_report;
+ struct hid_field *field;
+ s32 value;
+ int i, j;
+
+ if (mode == HID_HAPTIC_MODE_KERNEL)
+ value = HID_HAPTIC_ORDINAL_WAVEFORMSTOP;
+ else
+ value = haptic->default_auto_trigger;
+
+ mutex_lock(&haptic->auto_trigger_mutex);
+ for (i = 0; i < rep->maxfield; i++) {
+ field = rep->field[i];
+ /* Ignore if report count is out of bounds. */
+ if (field->report_count < 1)
+ continue;
+
+ for (j = 0; j < field->maxusage; j++) {
+ if (field->usage[j].hid == HID_HP_AUTOTRIGGER)
+ field->value[j] = value;
+ }
+ }
+
+ /* send the report */
+ hid_hw_request(hdev, rep, HID_REQ_SET_REPORT);
+ mutex_unlock(&haptic->auto_trigger_mutex);
+ haptic->mode = mode;
+}
+
+#ifdef CONFIG_PM
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic)
+{
+ if (haptic->is_forcepad && haptic->press_ordinal_cur &&
+ haptic->release_ordinal_cur)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+}
+EXPORT_SYMBOL_GPL(hid_haptic_resume);
+
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic)
+{
+ if (haptic->is_forcepad && haptic->press_ordinal_cur &&
+ haptic->release_ordinal_cur)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+}
+EXPORT_SYMBOL_GPL(hid_haptic_suspend);
+#endif
+
static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *effect,
struct ff_effect *old)
{
+ struct hid_device *hdev = input_get_drvdata(dev);
struct ff_device *ff = dev->ff;
struct hid_haptic_device *haptic = ff->private;
int i, ordinal = 0;
@@ -220,6 +272,24 @@ static int hid_haptic_upload_effect(struct input_dev *dev, struct ff_effect *eff
fill_effect_buf(haptic, &effect->u.hid, &haptic->effect[effect->id],
ordinal);
+ /* Mode switching needed only for forcepads. */
+ if (!haptic->is_forcepad)
+ return 0;
+
+ if (effect->id == HID_HAPTIC_RELEASE_EFFECT_ID) {
+ if (haptic->press_ordinal_cur &&
+ haptic->mode == HID_HAPTIC_MODE_DEVICE) {
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+ }
+ haptic->release_ordinal_cur = ordinal;
+ } else if (effect->id == HID_HAPTIC_PRESS_EFFECT_ID) {
+ if (haptic->release_ordinal_cur &&
+ haptic->mode == HID_HAPTIC_MODE_DEVICE) {
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_KERNEL);
+ }
+ haptic->press_ordinal_cur = ordinal;
+ }
+
return 0;
}
@@ -285,6 +355,7 @@ static void effect_set_default(struct ff_effect *effect)
static int hid_haptic_erase(struct input_dev *dev, int effect_id)
{
struct hid_haptic_device *haptic = dev->ff->private;
+ struct hid_device *hdev = input_get_drvdata(dev);
struct ff_effect effect;
int ordinal;
@@ -295,21 +366,29 @@ static int hid_haptic_erase(struct input_dev *dev, int effect_id)
switch (effect_id) {
case HID_HAPTIC_RELEASE_EFFECT_ID:
ordinal = haptic->release_ordinal_orig;
- if (!ordinal)
+ haptic->release_ordinal_cur = ordinal;
+ if (!ordinal) {
ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
- else
+ if (haptic->mode == HID_HAPTIC_MODE_KERNEL)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+ } else {
effect.u.hid.hid_usage = HID_HP_WAVEFORMRELEASE &
HID_USAGE;
+ }
fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
ordinal);
break;
case HID_HAPTIC_PRESS_EFFECT_ID:
ordinal = haptic->press_ordinal_orig;
- if (!ordinal)
+ haptic->press_ordinal_cur = ordinal;
+ if (!ordinal) {
ordinal = HID_HAPTIC_ORDINAL_WAVEFORMNONE;
- else
+ if (haptic->mode == HID_HAPTIC_MODE_KERNEL)
+ switch_mode(hdev, haptic, HID_HAPTIC_MODE_DEVICE);
+ } else {
effect.u.hid.hid_usage = HID_HP_WAVEFORMPRESS &
HID_USAGE;
+ }
fill_effect_buf(haptic, &effect.u.hid, &haptic->effect[effect_id],
ordinal);
break;
@@ -401,6 +480,7 @@ int hid_haptic_init(struct hid_device *hdev,
haptic->hid_usage_map[HID_HAPTIC_ORDINAL_WAVEFORMSTOP] =
HID_HP_WAVEFORMSTOP & HID_USAGE;
+ mutex_init(&haptic->auto_trigger_mutex);
for (r = 0; r < haptic->auto_trigger_report->maxfield; r++)
parse_auto_trigger_field(haptic, haptic->auto_trigger_report->field[r]);
@@ -582,13 +662,13 @@ void hid_haptic_handle_press_release(struct hid_haptic_device *haptic)
if (!prev_pressed_state && haptic->pressed_state &&
haptic->mode == HID_HAPTIC_MODE_KERNEL) {
spin_lock_irqsave(&input->event_lock, flags);
- input->ff->playback(input, PRESS_HID_EFFECT_ID, 1);
+ input->ff->playback(input, HID_HAPTIC_PRESS_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
}
if (prev_pressed_state && !haptic->pressed_state &&
haptic->mode == HID_HAPTIC_MODE_KERNEL) {
spin_lock_irqsave(&input->event_lock, flags);
- input->ff->playback(input, RELEASE_HID_EFFECT_ID, 1);
+ input->ff->playback(input, HID_HAPTIC_RELEASE_EFFECT_ID, 1);
spin_unlock_irqrestore(&input->event_lock, flags);
}
}
diff --git a/drivers/hid/hid-haptic.h b/drivers/hid/hid-haptic.h
index c26093e3773d..96757a4655ec 100644
--- a/drivers/hid/hid-haptic.h
+++ b/drivers/hid/hid-haptic.h
@@ -82,6 +82,10 @@ int hid_haptic_input_mapping(struct hid_device *hdev,
unsigned long **bit, int *max);
bool hid_haptic_input_configured(struct hid_device *hdev,
struct hid_haptic_device *haptic);
+#ifdef CONFIG_PM
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic);
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic);
+#endif
int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr);
void hid_haptic_handle_press_release(struct hid_haptic_device *haptic);
bool hid_haptic_handle_input(struct hid_haptic_device *haptic);
@@ -116,6 +120,12 @@ bool hid_haptic_input_configured(struct hid_device *hdev,
{
return 0;
}
+#ifdef CONFIG_PM
+static inline
+void hid_haptic_resume(struct hid_device *hdev, struct hid_haptic_device *haptic) {}
+static inline
+void hid_haptic_suspend(struct hid_device *hdev, struct hid_haptic_device *haptic) {}
+#endif
static inline
int hid_haptic_init(struct hid_device *hdev, struct hid_haptic_device **haptic_ptr)
{
--
2.36.0.550.gb090851708-goog
