From nobody Mon Mar 04 00:39:14 2024 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 4Tp0FG5Pcnz5CfBQ; Mon, 4 Mar 2024 00:39:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tp0FG4vMZz4kVQ; Mon, 4 Mar 2024 00:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512754; 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=nt/6Ja8ug5SCcY9r122eWwEUwbKTV/9ZvYR9LQiWTrw=; b=tN8yA/EH+He6X1K65iYfOo0DA5NJGYs+5ldgrF524/YWm0kHuE86zWqAGbQtKDKRs0yGE9 d2mm/4Tfolf8x7zsCQtk/LMXpskDMhjbJrfrjkvK5tDAsTvqdKNLq0cXb64C5Cr9ZL1tOp x9AvmZiJBXQIrkyLxPrFWeM/t17JdwqsBhvZ025cWFAtfGViDHn7uTKHnbyr1b59GDDQ+V MA/1+tZZbCr/t+APnwM2Jt3S97SBNBSUWLZKByE1gA7DhoNWYtSQ1sMGDFgmPY/AG6VPmU rGqQ74Gyt6+x/LUrpHptvPfDLx7u0QhT5YB1ab2WoW3GVrbeilwivZWB5ie/ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709512754; a=rsa-sha256; cv=none; b=CcRKsm/16xv+EeiZk2ezyCH+d23c0FiFVWLZSVM88sAyvyfbirFT3j/FNuegXX4R+l7rYR xmPtgqvsaEo4AvQ3AgbKxZ3qOQ7jVaG7tg62qXa5VENd4paxoRa0yz53nyWfCWD2RrSXrD zIVt1ju1xBkAHURxckRQlrdCPGkqNfu8opWayFCEdwOMGkP9YespOuuVZ8vCDYbqFwuGyT n8U3Sc639DTcsSDeppEvyQuyGOxbjE5e90iip5P1gcIf+7CZxxQFbAWIJW+ZlRIoC9NcLy LCD6mBPOJrK1d0NTrEwJwrTxSbJb5mvSSjd6WsKHpqbFVvIiQFegPeRw0GZ31A== 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=1709512754; 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=nt/6Ja8ug5SCcY9r122eWwEUwbKTV/9ZvYR9LQiWTrw=; b=gQEddxAxYwyyZvcKDGXDLa+Uwl1jNgD3n2URo0sYsbXlfrthLxPk5Ed9H77XuWI2loaYjt ZViLS3pOCs6HbziRrEFlnlRUpe6LUMlrQNZqdP/Y4a57KkQWpf1GplV4iLP/qUPT7fyiqV Yq9bTSV2ofjCEObdifdCdG/hNUPm2GleVQuPQGkhjH/TMt9b6AlXDEgcMRaiTYIIqzQ7Kv 28rT2L2RUr1Y/Dhd0W2RBaEYdlzOAS5kRRxZ/nrUy9RXLwIMdxLJEEEfRmpH+vEqnRmsL/ KbctlNM01AXBJ5UP/Zjm2GX+Ih4pcHyXGQ5JStTS1ud+T9i8vDREDy5Mo5rmVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0FG4FnHz119d; Mon, 4 Mar 2024 00:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4240dE8U059795; Mon, 4 Mar 2024 00:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4240dEx4059792; Mon, 4 Mar 2024 00:39:14 GMT (envelope-from git) Date: Mon, 4 Mar 2024 00:39:14 GMT Message-Id: <202403040039.4240dEx4059792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ebe18cb1a545 - stable/14 - snd_uaudio(4): Fix sample rate selection after 42fdcd9fd917. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/14 X-Git-Reftype: branch X-Git-Commit: ebe18cb1a545f41ce071f20494869c775d9255bf Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe18cb1a545f41ce071f20494869c775d9255bf commit ebe18cb1a545f41ce071f20494869c775d9255bf Author: Florian Walpen AuthorDate: 2024-02-26 23:27:47 +0000 Commit: Christos Margiolis CommitDate: 2024-03-04 00:38:58 +0000 snd_uaudio(4): Fix sample rate selection after 42fdcd9fd917. The sample rate selection of snd_uaudio(4) at runtime was implicitly relying on a specific order in the device config list. In case a default was set through the hw.usb.uaudio.default_rate sysctl tunable, commit 42fdcd9fd917 removed a duplicate sample rate entry from that list, which inadvertently broke sample rate selection at runtime. Implement sample rate selection in a way that works for any order in the device config list. Reported by: Lexi Winter MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D44051 (cherry picked from commit a9341f0f0ae01b4d249dbf3bacfa420152c46aef) --- sys/dev/sound/usb/uaudio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 26d95bf3ee9f..5d7396c527e0 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2768,20 +2768,19 @@ int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { struct uaudio_softc *sc; - uint8_t x; + uint8_t x, y; sc = ch->priv_sc; - for (x = 0; x < ch->num_alt; x++) { - if (ch->usb_alt[x].sample_rate < speed) { - /* sample rate is too low */ - break; - } + for (x = 0, y = 1; y < ch->num_alt; y++) { + /* prefer sample rate closer to and greater than requested */ + if ((ch->usb_alt[x].sample_rate < speed && + ch->usb_alt[x].sample_rate < ch->usb_alt[y].sample_rate) || + (speed <= ch->usb_alt[y].sample_rate && + ch->usb_alt[y].sample_rate < ch->usb_alt[x].sample_rate)) + x = y; } - if (x != 0) - x--; - usb_proc_explore_lock(sc->sc_udev); ch->set_alt = x; usb_proc_explore_unlock(sc->sc_udev);