From nobody Sun Apr 06 00:28:27 2025 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 4ZVY973VcSz5sbXj; Sun, 06 Apr 2025 00:28:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZVY9731f6z3wtF; Sun, 06 Apr 2025 00:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743899307; 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=NHsfVxMve0BDlaxkeNUfjbSvNLIFMIZY0qWdBI3tMmU=; b=mejdGPHY7SCtQbkcgOfthQu+R+UJ3SRSE22JVSbWSK0LO2BElDmARjD68HPFb9dk1lmA4l 6MfDCQ+7s8NgzKYfmxHUzz24Ep7xML2VxnFGq0SiYWPmEXihHkVqrqyk4o5GxTqiXuCAbJ VBoPaV5pL1k23LzAljFTDcJ1TWmLDobcGP85vRSaf+1/q3JKmhdJAxt+qQffAsKkYez4Ub bkuYu0piVQYrRTZOoH+jDjmIbrKPUoLRd/c/uR8aJzUz/Cxt5CMGzNwzg0Iq+wezyrZ54N f39gL7vYJ5t4NMR+8XQTY5yKgJp6MtZAZYkYrwqe3stTVBjCJp8P48FbEJaCVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743899307; a=rsa-sha256; cv=none; b=bXgHrCFW9QSGXVEuSm5b/6PKlN5hH6u8aCfQi2PGHgkbWT+7qa1dWbK08qfTb+n2Puo8W5 BykS0K7JNUti7UUGuZ+yZ0BTLWznr5g2P/OtLdWzwQFlGVeGL1ytzcwAqOtAsWnhHxPNoh ihq8Xr8asgyDdPZvHCy/MafYPuPTAIrq3PXGDeeqQVDVktky5egUZl/NAsM68RjaqA+Muh V14JPdyNqA/pl3YAKn0V71P67AlIqVjzq3eidUq8qmyzhIK+jTBamUo/KGXpzy8T7X4rB2 iSgepVJ3GJcIgfrmMkQqqb+fHSvqhFcoykUCPUpUz0t4fH6yUqHxCS8+ZUVUtg== 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=1743899307; 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=NHsfVxMve0BDlaxkeNUfjbSvNLIFMIZY0qWdBI3tMmU=; b=CvC3ZY0GdOu0MGXon4z8BXoYNWuFXzXebWMuH6iWEPssNXhn8vGMku6thPQmlFRDLLG9ws SKKsSVoEoxpEy8oSr4RCsRjUYO29krl3m0fZyHfSJaVWSaFpe1grvm1EYfDiKcidswP1iE RWGw9jjT/ChTpM9WHAL9LF8bPga6x0EVlFEJsAcHkpe4AOhcjbXISCH9x4Qa8h3oOiH7KQ prayriPHYX0du4cESNVHPNxXOErXqfiDmT35Y12aRyDEgJyLHlC/MaY0k0ZMk8FE2gqZTG c7kherYWQwCTGYeVJRnXrYBaS/ixb8L45AEADmVpc6ERsn3ElXdn+q22EhYQGA== 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 4ZVY972XXjzdjh; Sun, 06 Apr 2025 00:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5360SRAT065676; Sun, 6 Apr 2025 00:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5360SRP2065673; Sun, 6 Apr 2025 00:28:27 GMT (envelope-from git) Date: Sun, 6 Apr 2025 00:28:27 GMT Message-Id: <202504060028.5360SRP2065673@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: e4c0d796141b - stable/14 - sound: Fix vchanrate and vchanformat 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4c0d796141b6611780fdff3063f744bbd49b282 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e4c0d796141b6611780fdff3063f744bbd49b282 commit e4c0d796141b6611780fdff3063f744bbd49b282 Author: Christos Margiolis AuthorDate: 2025-03-30 17:45:34 +0000 Commit: Christos Margiolis CommitDate: 2025-04-06 00:28:14 +0000 sound: Fix vchanrate and vchanformat Make vchanrate and vchanformat reflect the primary channel's software buffer's rate and format respectively. Fix previous inconsistencies. Get rid of the initializations in vchan_create() and move them to chn_init(). Without the feeder_rate_round check in sysctl_dev_pcm_vchanrate(), we can set the software rate to anything between feeder_rate_min and feeder_rate_max. If we keep the check, however, the rate is limited to whatever the driver's min/max is, which can be a problem if, for example, the driver supports only a single rate, in which case we won't be able to set anything other than the driver rate. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48961 (cherry picked from commit e372211be5c56e218e974a4478be9aa80bfca064) --- sys/dev/sound/pcm/channel.c | 12 +++++-- sys/dev/sound/pcm/vchan.c | 82 ++------------------------------------------- 2 files changed, 13 insertions(+), 81 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 287e2f07d8a1..4a96505ada66 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1176,7 +1176,7 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, struct feeder_class *fc; struct snd_dbuf *b, *bs; char buf[CHN_NAMELEN]; - int err, i, direction; + int err, i, direction, *vchanrate, *vchanformat; PCM_BUSYASSERT(d); PCM_LOCKASSERT(d); @@ -1189,6 +1189,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, if (dir == PCMDIR_PLAY_VIRTUAL) d->pvchancount++; direction = PCMDIR_PLAY; + vchanrate = &d->pvchanrate; + vchanformat = &d->pvchanformat; break; case PCMDIR_REC: d->reccount++; @@ -1197,6 +1199,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, if (dir == PCMDIR_REC_VIRTUAL) d->rvchancount++; direction = PCMDIR_REC; + vchanrate = &d->rvchanrate; + vchanformat = &d->rvchanformat; break; default: device_printf(d->dev, @@ -1301,8 +1305,12 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, PCM_LOCK(d); CHN_INSERT_SORT_ASCEND(d, c, channels.pcm); - if ((c->flags & CHN_F_VIRTUAL) == 0) + if ((c->flags & CHN_F_VIRTUAL) == 0) { CHN_INSERT_SORT_ASCEND(d, c, channels.pcm.primary); + /* Initialize the *vchanrate/vchanformat parameters. */ + *vchanrate = sndbuf_getspd(c->bufsoft); + *vchanformat = sndbuf_getfmt(c->bufsoft); + } return (c); diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 7064f1e51125..1f184f21807e 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -405,7 +405,6 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) { struct snddev_info *d; struct pcm_channel *c, *ch; - struct pcmchan_caps *caps; int *vchanrate, direction, ret, newspd, restart; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); @@ -467,13 +466,6 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) } else restart = 0; - if (feeder_rate_round) { - caps = chn_getcaps(c); - RANGE(newspd, caps->minspeed, caps->maxspeed); - newspd = CHANNEL_SETSPEED(c->methods, - c->devinfo, newspd); - } - ret = chn_reset(c, c->format, newspd); if (ret == 0) { if (restart != 0) { @@ -488,7 +480,7 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) } } } - *vchanrate = c->speed; + *vchanrate = sndbuf_getspd(c->bufsoft); CHN_UNLOCK(c); } @@ -583,7 +575,7 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) } } } - *vchanformat = c->format; + *vchanformat = sndbuf_getfmt(c->bufsoft); CHN_UNLOCK(c); } @@ -607,11 +599,9 @@ vchan_create(struct pcm_channel *parent, struct pcm_channel **child) struct pcm_channel *ch; struct pcmchan_caps *parent_caps; uint32_t vchanfmt, vchanspd; - int ret, direction, r; - bool save; + int ret, direction; ret = 0; - save = false; d = parent->parentsnddev; PCM_BUSYASSERT(d); @@ -659,75 +649,9 @@ vchan_create(struct pcm_channel *parent, struct pcm_channel **child) goto fail; } - if (vchanfmt == 0) { - const char *vfmt; - - CHN_UNLOCK(parent); - r = resource_string_value(device_get_name(parent->dev), - device_get_unit(parent->dev), VCHAN_FMT_HINT(direction), - &vfmt); - CHN_LOCK(parent); - if (r != 0) - vfmt = NULL; - if (vfmt != NULL) { - vchanfmt = snd_str2afmt(vfmt); - if (vchanfmt != 0 && !(vchanfmt & AFMT_VCHAN)) - vchanfmt = 0; - } - if (vchanfmt == 0) - vchanfmt = VCHAN_DEFAULT_FORMAT; - save = true; - } - - if (vchanspd == 0) { - /* - * This is very sad. Few soundcards advertised as being - * able to do (insanely) higher/lower speed, but in - * reality, they simply can't. At least, we give user chance - * to set sane value via kernel hints or sysctl. - */ - CHN_UNLOCK(parent); - r = resource_int_value(device_get_name(parent->dev), - device_get_unit(parent->dev), VCHAN_SPD_HINT(direction), - &vchanspd); - CHN_LOCK(parent); - if (r != 0) { - /* No saved value, no hint, NOTHING. */ - vchanspd = VCHAN_DEFAULT_RATE; - RANGE(vchanspd, parent_caps->minspeed, - parent_caps->maxspeed); - } - save = true; - } - - /* - * Limit the speed between feeder_rate_min <-> feeder_rate_max. - */ - RANGE(vchanspd, feeder_rate_min, feeder_rate_max); - - if (feeder_rate_round) { - RANGE(vchanspd, parent_caps->minspeed, - parent_caps->maxspeed); - vchanspd = CHANNEL_SETSPEED(parent->methods, - parent->devinfo, vchanspd); - } - if ((ret = chn_reset(parent, vchanfmt, vchanspd)) != 0) goto fail; - if (save) { - /* - * Save new value. - */ - if (direction == PCMDIR_PLAY_VIRTUAL) { - d->pvchanformat = parent->format; - d->pvchanrate = parent->speed; - } else { - d->rvchanformat = parent->format; - d->rvchanrate = parent->speed; - } - } - /* * If the parent channel supports digital format, * enable passthrough mode.