Message ID | 20230412175311.1.Ieb687047a5b75c7b7ee5dd258207ef5ca9a3b728@changeid |
---|---|
State | New |
Headers | show |
Series | Input: synaptics - disable intertouch for Lenovo L440 | expand |
This patch looks fine to me, I'm a bit curious though whether the folks at Synaptics have any idea of some other workaround we might be able to do rather than disabling intertouch? Added Andrew Duggan to CC to ask. If we don't get any response from them after a while, feel free to consider this: Reviewed-by: Lyude Paul <lyude@redhat.com> On Wed, 2023-04-12 at 17:54 -0500, Jonathan Denose wrote: > When intertouch is enabled for the L440 a (deep)sleep/resume > cycle causes the touchpad driver to hang which causes the > touchpad to become unresponsive. Disable intertouch resolves > this issue and the touchpad is fine after resume from sleep. > > Additionally, when the PNP id for the L440 is only removed > from the topbuttonpad_pnp_ids list, a message is logged to > enable psmouse.synaptics_intertouch, which would cause the > sleep/resume issue again. By removing the PNP id from > topbutton_pnp_ids and then adding it to the > forcepad_pnp_ids array, intertouch is disabled and the > message is not logged. > > Signed-off-by: Jonathan Denose <jdenose@google.com> > --- > > drivers/input/mouse/synaptics.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c > index fa021af8506e4..77a4f58128e84 100644 > --- a/drivers/input/mouse/synaptics.c > +++ b/drivers/input/mouse/synaptics.c > @@ -150,7 +150,6 @@ static const char * const topbuttonpad_pnp_ids[] = { > "LEN2001", /* Edge E431 */ > "LEN2002", /* Edge E531 */ > "LEN2003", > - "LEN2004", /* L440 */ > "LEN2005", > "LEN2006", /* Edge E440/E540 */ > "LEN2007", > @@ -198,6 +197,7 @@ static const char * const smbus_pnp_ids[] = { > static const char * const forcepad_pnp_ids[] = { > "SYN300D", > "SYN3014", > + "LEN2004", /* L440 */ > NULL > }; > > @@ -1769,6 +1769,8 @@ static int synaptics_create_intertouch(struct psmouse *psmouse, > .flags = I2C_CLIENT_HOST_NOTIFY, > }; > > + psmouse_dbg(psmouse, "topbuttonpad is: %s\n", topbuttonpad ? "true" : "false"); > + > return psmouse_smbus_init(psmouse, &intertouch_board, > &pdata, sizeof(pdata), true, > leave_breadcrumbs);
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index fa021af8506e4..77a4f58128e84 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -150,7 +150,6 @@ static const char * const topbuttonpad_pnp_ids[] = { "LEN2001", /* Edge E431 */ "LEN2002", /* Edge E531 */ "LEN2003", - "LEN2004", /* L440 */ "LEN2005", "LEN2006", /* Edge E440/E540 */ "LEN2007", @@ -198,6 +197,7 @@ static const char * const smbus_pnp_ids[] = { static const char * const forcepad_pnp_ids[] = { "SYN300D", "SYN3014", + "LEN2004", /* L440 */ NULL }; @@ -1769,6 +1769,8 @@ static int synaptics_create_intertouch(struct psmouse *psmouse, .flags = I2C_CLIENT_HOST_NOTIFY, }; + psmouse_dbg(psmouse, "topbuttonpad is: %s\n", topbuttonpad ? "true" : "false"); + return psmouse_smbus_init(psmouse, &intertouch_board, &pdata, sizeof(pdata), true, leave_breadcrumbs);
When intertouch is enabled for the L440 a (deep)sleep/resume cycle causes the touchpad driver to hang which causes the touchpad to become unresponsive. Disable intertouch resolves this issue and the touchpad is fine after resume from sleep. Additionally, when the PNP id for the L440 is only removed from the topbuttonpad_pnp_ids list, a message is logged to enable psmouse.synaptics_intertouch, which would cause the sleep/resume issue again. By removing the PNP id from topbutton_pnp_ids and then adding it to the forcepad_pnp_ids array, intertouch is disabled and the message is not logged. Signed-off-by: Jonathan Denose <jdenose@google.com> --- drivers/input/mouse/synaptics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)