From nobody Tue Feb 18 19:37:38 2025 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 4Yy8tq1RB4z5p4qD; Tue, 18 Feb 2025 19:37:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy8tp5Bczz3njT; Tue, 18 Feb 2025 19:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739907458; 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=9YjSMxNnUZm/g2EwWbHdTnggiFoKHkk3ZoiK6YvLOFY=; b=ve4BSd6flrMoyGr4bp7Y3ZTDPQxAXdapCKmbcJD2ObQCpbhRG1NFz1GcwOswfuCVca6oFu Tp0PGfrfVNK6gya8Kn8sYcR8agSDPIz7++DImsw/MWJizSZ8wKtLmiE5NRC2atJCeRk/Bi JbKKPYbbGCmlVVzoxY0WrKhWZdN02sCnA5EwDNLuendqQ5FPwSoRxVbi+cBUgYEyEW6UkV Egh/PEnVok7V8tVcuJJF6AES5krzFV341v50iCgbbrNUOjEWlPjSdA/dfkyVoVmoPqkzim 9Vmy60B9hOeHHAPDHSSEzKDWOIvClrub6hGVPxlSPnaoa2XZUG3r7LfsLc4rmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739907458; a=rsa-sha256; cv=none; b=Rn00rTQOWXeh5fNqEEVkmzCcwSP++qKH07EoFHF1VMoR7U2WLpA+IGckTzJDi9uX+MxEMR Ko8VDlIFCtSkl9oScXRJfDkTPYCXQRfrL9DjerYXDzpAN+1wkQzU3Q+wu1f6Mn7sogBTJ8 OTBRvVRhBFRhu0AGiUT5AfQ/ROWHCh4kuGLz+sUI9zHqlFJP5CDDTocfE4mlP1nFLdWR66 8Rcjhs7j9P3//YGfCkedLZJYv75PF0IjUTKlD4boJ/2buPDqXc+JouhcVn+o1wV/6hReEh ma6iLfVNWdBbthV/ADrbXnqAoySxSujS4kFRXzUMj6QQcmbLtFdEcRJCfAvfqw== 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=1739907458; 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=9YjSMxNnUZm/g2EwWbHdTnggiFoKHkk3ZoiK6YvLOFY=; b=P6YeqrQJAfx6rZV6PkzLEeUy/wHAMT7+axJSJI1cHzNgudcFQmFVPnMkLmUwrnCf7PntHZ r1oCxfHBsH3nmYHWaeWu6cUWIxAso1cGoR9ht71DXY17lLzbKRqQsxfwR6+aHPYZYEcJlz Ztt6rSk5WhwpIDS6UvVuIjozwU4qBe48RHfjhWnIToHwDZiRaEWn7bgdxOSoVzoErxoMbC LE6q7JAvez+g2LrRSccoMuaKskDJYHZIFg2ZwFuMx1ohzUaXKgVWUjDSiBtUpt1x7aB0Lz F4xL+xMkwgiJyluSNk6ZOSWHok7pSRXOYBq4Jb5HxQI2p/4B8n/VMQjrKF/ryw== 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 4Yy8tp4W6MzZnB; Tue, 18 Feb 2025 19:37:38 +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 51IJbcQL029778; Tue, 18 Feb 2025 19:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IJbcv5029775; Tue, 18 Feb 2025 19:37:38 GMT (envelope-from git) Date: Tue, 18 Feb 2025 19:37:38 GMT Message-Id: <202502181937.51IJbcv5029775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 18457e7e25c5 - main - sound: Bail out early if a format is not supported 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18457e7e25c55b8834e886fd925ec3b11b79d1b6 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=18457e7e25c55b8834e886fd925ec3b11b79d1b6 commit 18457e7e25c55b8834e886fd925ec3b11b79d1b6 Author: Christos Margiolis AuthorDate: 2025-02-18 19:36:48 +0000 Commit: Christos Margiolis CommitDate: 2025-02-18 19:37:22 +0000 sound: Bail out early if a format is not supported If a format is unsupported, the feeder_build_* functions will fail anyway, so bail out early to avoid unnecessary computation. This is also needed by a series of upcoming patches to the feeder framework. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48031 --- sys/dev/sound/pcm/feeder_chain.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 588bae2ff281..1c4ddca6cdd5 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -718,6 +718,17 @@ feeder_chain(struct pcm_channel *c) c->format = cdesc.target.afmt; c->speed = cdesc.target.rate; } else { + /* + * Bail out early if we do not support either of those formats. + */ + if ((cdesc.origin.afmt & AFMT_CONVERTIBLE) == 0 || + (cdesc.target.afmt & AFMT_CONVERTIBLE) == 0) { + device_printf(c->dev, + "%s(): unsupported formats: in=0x%08x, out=0x%08x\n", + __func__, cdesc.origin.afmt, cdesc.target.afmt); + return (ENODEV); + } + /* hwfmt is not convertible, so 'dummy' it. */ if (hwfmt & AFMT_PASSTHROUGH) cdesc.dummy = 1;