From nobody Sun Apr 12 18:10:13 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftz914LXDz6YSXJ for ; Sun, 12 Apr 2026 18:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftz9132nbz3Sfr for ; Sun, 12 Apr 2026 18:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776017413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejQIX8C1KFihRlFnTjA+cEgp5iJoIBeKeahcEjyT99M=; b=TGgati2eAWHA3FrdEr+BiX8Day5X6zGcVMDgPPzPHbo7af1PZ0wN381smoWMDCcKS29/p1 Nrx+nRuEGgnXTU2/rIHuPW+pRtIaPo/NfKbc5D7bUI6oxmz3s7b403AXKGk9c7xgwsahwV Ch92AUFMxfNnOXgH/cHom/oLaulAtbdFqnqQ57wkqg/3OWSdx6Ol2mBbcdDMdBK8aQBxMj r+VlirddWr96tmhfvDgzdf6xPGPy3KUj/ZOMPeuaPFekEjy0eHoz9JxWbl3S7umdCHljol yey8JxMRgsy9JiyYtBKcbGege5eDssWaCxDvtE272sqiwRe5eZz/xswYOWchQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776017413; a=rsa-sha256; cv=none; b=e5aIDCNOqflzfipbwSCCBn4lWM9AkNiQnZAiKfpGypNwQFptPDohJggGZmpOf1mEJlEdDC Vn6F2E7jMU0DSbA8nmedQDIwscau4axuDvpu2ofCS9SeiGS3wR/Xazetone35CCrCvfrNA fp4zEGwaojyivuphXrgOWqeqP0F2kjMkLhE0ge5IMy2EqdigeqkLxJJZ7Y1jSBy1MlSECr j5c3KmPuWwAUjEPrpPiC/qXJ483B4uP0qqxrEX0orAvNMue72cg8d9So4cWnbkhYLfmHGF Ug72+nf9jamAqxjQ1eIl9H3amYpH0E6puvyObVX0nA0+jo2p17O2zzXPQcEEaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776017413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ejQIX8C1KFihRlFnTjA+cEgp5iJoIBeKeahcEjyT99M=; b=UBy29vXYoD979QYShu3pwzJcIkbwFklmp/ABtpugGGc/UC2qDS/kZ0xKvE0MfKuwKBIxCs XxycLHZv4Uu8RG8CP68G+D5UfFemLmEWgk9FbBys9RSQKRWHBJs1VCv4o1nfypuxRqJp1W 8KZwwHC014sQl8MKJ3dQWk/XCAyaGBOtYG62ybfCpG3JNsguZYNDHRUi97VYQLfywI73Jy QgKtNtDQpsiqbjqjLZ6ZOXZykCkG4fZbzQmV5vulNWyU3fuE9hNIsiZqJvqsJecfvpxX/R DzY2It7NDcy779eybXYCOoDbRuy6EE/sCJ9xUFIYq/dN/Y+/cm2xZZcPPgzPPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftz912bHGzChZ for ; Sun, 12 Apr 2026 18:10:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 361d1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 18:10:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9d0404cfe92c - main - bcm5974(4): Do not handle pressure on non-ForceTouch devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d0404cfe92c18b7697b3e4ad4a5790b12d2261e Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 18:10:13 +0000 Message-Id: <69dbe005.361d1.7601e80@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0404cfe92c18b7697b3e4ad4a5790b12d2261e commit 9d0404cfe92c18b7697b3e4ad4a5790b12d2261e Author: Vladimir Kondratyev AuthorDate: 2026-04-12 18:09:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-12 18:09:23 +0000 bcm5974(4): Do not handle pressure on non-ForceTouch devices They always report it value as zero breaking pressure-driven drivers like moused(8) and xf86-input-synaptics. MFC after: 1 week --- sys/dev/hid/bcm5974.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index 7af6fbc24635..e2efeb08eb2e 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -120,6 +120,7 @@ enum tp_type { /* list of device capability bits */ #define HAS_INTEGRATED_BUTTON 1 #define USES_COMPACT_REPORT 2 +#define SUPPORTS_FORCETOUCH 4 struct tp_type_params { uint8_t caps; /* device capability bitmask */ @@ -146,13 +147,13 @@ struct tp_type_params { .delta = 0, }, [TYPE4] = { - .caps = HAS_INTEGRATED_BUTTON, + .caps = HAS_INTEGRATED_BUTTON | SUPPORTS_FORCETOUCH, .button = 31, .offset = 23 * 2, .delta = 2, }, [TYPE_MT2U] = { - .caps = HAS_INTEGRATED_BUTTON | USES_COMPACT_REPORT, + .caps = HAS_INTEGRATED_BUTTON | USES_COMPACT_REPORT | SUPPORTS_FORCETOUCH, .button = 1, .offset = 12, .delta = 0, @@ -752,7 +753,8 @@ bcm5974_attach(device_t dev) BCM5974_ABS(sc->sc_evdev, ABS_MT_POSITION_X, sc->sc_params->x); BCM5974_ABS(sc->sc_evdev, ABS_MT_POSITION_Y, sc->sc_params->y); /* finger pressure */ - BCM5974_ABS(sc->sc_evdev, ABS_MT_PRESSURE, sc->sc_params->p); + if ((sc->sc_params->tp->caps & SUPPORTS_FORCETOUCH) != 0) + BCM5974_ABS(sc->sc_evdev, ABS_MT_PRESSURE, sc->sc_params->p); /* finger touch area */ BCM5974_ABS(sc->sc_evdev, ABS_MT_TOUCH_MAJOR, sc->sc_params->w); BCM5974_ABS(sc->sc_evdev, ABS_MT_TOUCH_MINOR, sc->sc_params->w);