From patchwork Thu Nov 20 07:42:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 5346431 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 063B4C11AC for ; Thu, 20 Nov 2014 07:42:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B9BA20222 for ; Thu, 20 Nov 2014 07:42:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3513C20221 for ; Thu, 20 Nov 2014 07:42:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756633AbaKTHmN (ORCPT ); Thu, 20 Nov 2014 02:42:13 -0500 Received: from mail-ie0-f179.google.com ([209.85.223.179]:44190 "EHLO mail-ie0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029AbaKTHmM (ORCPT ); Thu, 20 Nov 2014 02:42:12 -0500 Received: by mail-ie0-f179.google.com with SMTP id rp18so2255452iec.38 for ; Wed, 19 Nov 2014 23:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=ODJR5IuIZt7c8QVPBKAN+KrZ/AdPgCpVihZbibRpKac=; b=PrTQDMm4RDmBtdQ6fkRPkNQXANqRMHEXJdIy1FE08OYeCBfhp+5HNu4ugD0eueXEzm a2FZMvz1Nk+d3En3ZFkNgLPv4Nu8LSV7fu0e2zsQR6iKdYFfSZEmy95h+gZcq2cl6zGw ZAdTCiHtNA6U1gi8+PRcinlCkhEhMqzLfud9cRXCARF9FaKTdOtaHY/smQSVipOzc47x jeRcYxVjHYhcE3TuNPqrj+OevU2lppB+dw+6Sbf2iYyI2brTCawDUUfz0Ee2KVHqBR26 FBp8UMixDB0exysdeCwQAK/ob+l4JVRxdhzvgKs9bTTCbRTRVq6goc08uO/Um12KWXoZ th2A== X-Received: by 10.50.30.200 with SMTP id u8mr14812096igh.35.1416469332142; Wed, 19 Nov 2014 23:42:12 -0800 (PST) Received: from dtor-ws ([2620:0:1000:1301:e549:e77:60d1:43bb]) by mx.google.com with ESMTPSA id j2sm1178645igj.14.2014.11.19.23.42.10 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 19 Nov 2014 23:42:10 -0800 (PST) Date: Wed, 19 Nov 2014 23:42:07 -0800 From: Dmitry Torokhov To: Anders Kaseorg Cc: Ulrik De Bie , linux-input@vger.kernel.org, Hans de Goede , David Herrmann , Marcus Overhagen Subject: Re: Bisected two-finger scrolling regression on Lenovo Y50 (Re: [PATCH 1/5] Input: elantech - use elantech_report_trackpoint for hardware v4 too) Message-ID: <20141120074207.GA30434@dtor-ws> References: <1409407846-15449-1-git-send-email-ulrik.debie-os@e2big.org> <1409407846-15449-2-git-send-email-ulrik.debie-os@e2big.org> <546D9120.1040703@mit.edu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <546D9120.1040703@mit.edu> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Anders, On Thu, Nov 20, 2014 at 01:58:40AM -0500, Anders Kaseorg wrote: > On 08/30/2014 10:10 AM, Ulrik De Bie wrote: > >The Fujitsu H730 has hardware v4 with a trackpoint. This enables > >the elantech_report_trackpoint for v4. > > Kernel 3.18-rc5 has made two-finger scrolling unusably glitchy on my > Lenovo Y50-70 Touch, and caused an associated kernel warning. I > bisected the regression to this commit (caeb0d37). > > This may be the same as https://bugzilla.redhat.com/1165390, > although that only reports the warning, not the glitchy scrolling. > Thank you for your report. Please try the patch below. Markus, I put you as tested-by since you tried basically the same patch earlier. diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 3fcb6b3..f2b9780 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -428,14 +428,6 @@ static void elantech_report_trackpoint(struct psmouse *psmouse, int x, y; u32 t; - if (dev_WARN_ONCE(&psmouse->ps2dev.serio->dev, - !tp_dev, - psmouse_fmt("Unexpected trackpoint message\n"))) { - if (etd->debug == 1) - elantech_packet_dump(psmouse); - return; - } - t = get_unaligned_le32(&packet[0]); switch (t & ~7U) { @@ -793,7 +785,7 @@ static int elantech_packet_check_v4(struct psmouse *psmouse) unsigned char packet_type = packet[3] & 0x03; bool sanity_check; - if ((packet[3] & 0x0f) == 0x06) + if (etd->tp_dev && (packet[3] & 0x0f) == 0x06) return PACKET_TRACKPOINT; /*