From nobody Sun Jun 7 21:19:42 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 4gYSjq1Ttjz6g6sZ for ; Sun, 07 Jun 2026 21:19:43 +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 4gYSjp6SCKz3b8r for ; Sun, 07 Jun 2026 21:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780867182; 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=2MmSLZgq9s9Nmwq32GUWRHbmEgI+KUWFxcJFXNM93jk=; b=jw31tipWt5l0HZaU4twclAEJ97W+NpctECGmGYfjY+UYn2pJ7ggAYC6IdlaHHf9cwzvnl/ qpEaKUDocnllDZkOLXV3v+de5YTxw+7wWfxP0zrwns/y1n6YGr/VmYtMu5+l4S1b2NeRQy jVXZg8ZhNfE8nPVOL0ixqYtvTgRrs/37cgriuNuFBAn1AF27uTIvL5UxCEeNbYFToQmStJ wWs1lEv3PCFlEI3XJkEfh8dmMf1FOQogX4S4t4ao1KPcnmObs1tVjSIbcMoxI1hgcdn5sJ Ixi0dw+fYLQbITNlZYoFTWl6CesLBnt7tQ8bcLALnSMwlseOO5isZZM1RDg0ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780867182; a=rsa-sha256; cv=none; b=DYNv+T635YSMB7+fcT4kGxFzOpgpQsVB3R9MT/Pziwd4GM83pYaLT0U8VzTQYhzuzzIAZ5 TlPhb1BPqxxlB4RYArIJzVVMdxw6hr0IIY0o7BlMSXEsirFtRTq3FJ5BKgDHswhI0zEofa pL3Ct3684dZ8fs2nD4wklH2QJkkAVhcaxcuHMrWSDUYqsltR68dm39Ec4g/n5GV4m3g7fV y5b7fYMLyjQuswZHN4c64bfqS+5ZIXncSvAaM4bV/z+XpNDKDWHPBgWoENzqlvXVIvvayk ZVHNUn3Ip3FY9qRbHQW45BpAimxhOhzNHSE/6hnOOpqKx1mzLHsP8iXAYpDXlg== 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=1780867182; 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=2MmSLZgq9s9Nmwq32GUWRHbmEgI+KUWFxcJFXNM93jk=; b=lgk7tZ8Vh3QkoJsDo7X9SMGuzMHl94OMPXQ1C9zPT9yKnrmqPs+R9GgapT85AdBO43g8nx Fkqc2+SScFmrs7ODr7E06I+HzQGdPOpQOCkdOOCYF0GPvyiwDtf6+StP+WeTMW5DIM2Z1i oTfto8rFyeSt/oIfIZtX+2CcPp/NK8wOyf51XHx8g5ey4YBCG8Oz0IsbSqO4Obxj28Op1z WaZkXHmb9FPtn3yOEH9DC2tbKBBB/oQjhuZke1+1UqRig3jCEaNss2I0yuloklbFlkFwr0 3gq3B5GiUE2LOIvhffJ57ocipUNY7WjVa+GBgSwJDnvMX+4dIuRWnm8i7t/vBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYSjp5qYXz3V5 for ; Sun, 07 Jun 2026 21:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18491 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 07 Jun 2026 21:19:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a48a807e9bf7 - stable/15 - sound: Centralize and improve hot-swapping 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a48a807e9bf784ec06eeb89f38b1c6c2f191c212 Auto-Submitted: auto-generated Date: Sun, 07 Jun 2026 21:19:42 +0000 Message-Id: <6a25e06e.18491.3a66d880@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a48a807e9bf784ec06eeb89f38b1c6c2f191c212 commit a48a807e9bf784ec06eeb89f38b1c6c2f191c212 Author: Christos Margiolis AuthorDate: 2026-05-21 12:22:38 +0000 Commit: Christos Margiolis CommitDate: 2026-06-07 21:19:35 +0000 sound: Centralize and improve hot-swapping Introduce pcm_hotswap(), which is responsible for sending devctl SND/CONN notifications. There are two user-visible improvements with this patch: First, in pcm_unregister(), instead of just sending a SND/CONN/NODEV notification when all devices have detached, we also switch to the new default device if the previously default one has detached, but there are more left. Second, in pcm_register(), if the device happens to also be the new default device, we hot-swap to it. Additionally, if hw.snd.default_auto is set to 2, then we will essentially be hot-swapping to the newest attached device. The latter is especially useful for laptops like the Framework 16, which comes with a built-in snd_hda(4) speaker-microphone-only device, and headphones can work with the Framework Audio Expansion Card, which does not extend the snd_hda(4) device, but is in fact a separate snd_uaudio(4) device. To achieve automatic audio redirection between headphones and speakers in this case, there has to be a way to switch between different devices. The way the Audio Expansion Card works is by having snd_uaudio(4) attach to it when the headphones are plugged, and detach when unplugged, so this patch, along with hw.snd.default_auto=2, can pick up those attach events and switch automatically. Combined with the pcm_unregister() update, it becomes possible to switch back and forth between headphones and speakers. While here, be more robust and lock around snd_unit reads. In collaboration with: jrm Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 9fb56421425fa35e56ce294284c08b09852052a5) --- sys/dev/sound/pcm/sound.c | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index d98952d7a984..235142eb5209 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -77,11 +77,30 @@ snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand return bus_setup_intr(dev, res, flags, NULL, hand, param, cookiep); } +static void +pcm_hotswap(void) +{ + struct snddev_info *d; + char buf[32]; + + bus_topo_assert(); + if (snd_unit >= 0) { + d = devclass_get_softc(pcm_devclass, snd_unit); + if (!PCM_REGISTERED(d)) + return; + snprintf(buf, sizeof(buf), "cdev=dsp%d", snd_unit); + if (d->reccount > 0) + devctl_notify("SND", "CONN", "IN", buf); + if (d->playcount > 0) + devctl_notify("SND", "CONN", "OUT", buf); + } else + devctl_notify("SND", "CONN", "NODEV", NULL); +} + static int sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) { struct snddev_info *d; - char buf[32]; int error, unit; unit = snd_unit; @@ -95,13 +114,8 @@ sysctl_hw_snd_default_unit(SYSCTL_HANDLER_ARGS) } snd_unit = unit; snd_unit_auto = 0; + pcm_hotswap(); bus_topo_unlock(); - - snprintf(buf, sizeof(buf), "cdev=dsp%d", snd_unit); - if (d->reccount > 0) - devctl_notify("SND", "CONN", "IN", buf); - if (d->playcount > 0) - devctl_notify("SND", "CONN", "OUT", buf); } return (error); } @@ -373,6 +387,7 @@ int pcm_register(device_t dev, char *str) { struct snddev_info *d = device_get_softc(dev); + int err; /* should only be called once */ if (d->flags & SD_F_REGISTERED) @@ -417,6 +432,13 @@ pcm_register(device_t dev, char *str) vchan_initsys(dev); feeder_eq_initsys(dev); + sndstat_register(dev, SNDST_TYPE_PCM, d->status); + + err = dsp_make_dev(dev); + if (err) + return (err); + + bus_topo_lock(); if (snd_unit_auto < 0) snd_unit_auto = (snd_unit < 0) ? 1 : 0; if (snd_unit < 0 || snd_unit_auto > 1) @@ -424,9 +446,11 @@ pcm_register(device_t dev, char *str) else if (snd_unit_auto == 1) snd_unit = pcm_best_unit(snd_unit); - sndstat_register(dev, SNDST_TYPE_PCM, d->status); + if (snd_unit == device_get_unit(dev)) + pcm_hotswap(); + bus_topo_unlock(); - return (dsp_make_dev(dev)); + return (0); } int @@ -469,13 +493,14 @@ pcm_unregister(device_t dev) cv_destroy(&d->cv); mtx_destroy(&d->lock); + bus_topo_lock(); if (snd_unit == device_get_unit(dev)) { snd_unit = pcm_best_unit(-1); if (snd_unit_auto == 0) snd_unit_auto = 1; - if (snd_unit < 0) - devctl_notify("SND", "CONN", "NODEV", NULL); + pcm_hotswap(); } + bus_topo_unlock(); return (0); }