From nobody Wed Apr 22 20:08:15 2026 X-Original-To: dev-commits-src-branches@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 4g19Jc0ZM8z6bDfb for ; Wed, 22 Apr 2026 20:08:16 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g19Jb5WG0z3Lvs for ; Wed, 22 Apr 2026 20:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888495; 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=nzp85EbRKZwyOpua2ZRtQ05aOzx23PaepUoM5y6m7UQ=; b=thXaGg+/VRCSZoo3OycL2ywJNwMhQpElaEEMzUNCyA7OZPn6c7565QgQkPqrSrjEQXQZk8 gdkDcOZpywuEOBZPOIb9Kf26Rm9FNCRR1yjiyeNbdPN1YYtZnDciuQIuR4mbCQkcNL8Iv7 tzdOO/qfRwHZ9NJ1uhngtaNoDTSeCy1J6B15q9vMkzZQkc497O9Y/9xAaEKiNiBEe1p1wS EiKK+277dNcJoC0m27ISGvxpbawUERWeDCW2mk0pXQGnS+Pzw9ej/WDGWgWpFx2bCvvnf/ LE14j2VVbMIIaOhPHWTA1SVe5wOD4DS2d/NmM5msfgO0lj5Qof8oQqw0doJExg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776888495; a=rsa-sha256; cv=none; b=m6/Ia5liL4o1FmbQNIz/xe3OCYUSg+lxfai32GNSQQmoYB83nANmj0oco1UI5XA8xLbEBK IOTbj6gnv97xLrcQHWh+P/s2ucLc43TR13zPmdkY7umNQvTCya7pXpzmmtYp4kJrk06vab DgLY8KWrRpmYQK4u7bc4Rt7/OS0kbebqNw7g7mHOOQOu8OO934UQSwFhBAirJNlddVWSyo oZWq6UTP8o2c3m9xp0lCLf8IceiU0wOkyO2iHOLKRfRqYdTzdphqxU/wRe8FoAzhETLLa7 pcjwr9CtrT+l2BvYs/HmI2Blmq9hI3MvMQQowYWjS4SIUWYP0HE5hvYMH9D+FQ== 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=1776888495; 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=nzp85EbRKZwyOpua2ZRtQ05aOzx23PaepUoM5y6m7UQ=; b=gWToJEPmF/gD/ZoDzgiY1JTJxJ7BbtAwqCRR/lZGc8dlnc3MZKXcTVMkAob2Q09sFs8uYU ZuoeDS2BRlZQVGdyWc5I+aGls27mA7W11b/gyqwNdxVxP1CaCtDzqRLTIYF9IxsO+LDbEc Ce9S4Q/1jKRMACPY1tfx3BKhXmYw2RC5qi8f1VKr1vdYWrTmrR1ilh/YhrX3OHQTcjKibQ ekfadZ2v8PUbsVL+O043be2JcPJ3m+K0+0y4ur9L6qiIiBPq2R7vasV1/aqgqb8068Vk0t Gn8lLWzXFLgdfN6wMv/ZOuzgI8zA+5uz96Bjdh90IdXGSL1H/LMV9JO9HqETVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g19Jb50zbzls7 for ; Wed, 22 Apr 2026 20:08:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e77c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:08:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: ad5bf14a3dcb - stable/15 - bcm5974(4): Do not handle pressure on non-ForceTouch devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: ad5bf14a3dcbcbb101834ee07948ff1ae7198bd1 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:08:15 +0000 Message-Id: <69e92aaf.1e77c.84360cd@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=ad5bf14a3dcbcbb101834ee07948ff1ae7198bd1 commit ad5bf14a3dcbcbb101834ee07948ff1ae7198bd1 Author: Vladimir Kondratyev AuthorDate: 2026-04-12 18:09:23 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-22 19:59:04 +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 (cherry picked from commit 9d0404cfe92c18b7697b3e4ad4a5790b12d2261e) --- 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);