From patchwork Tue Nov 14 20:13:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 743803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44AE8C54E5B for ; Tue, 14 Nov 2023 20:15:15 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 319AD886; Tue, 14 Nov 2023 21:14:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 319AD886 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1699992913; bh=ZVd8JR7JWwIAD73tuYOePPRkfmlids1h2RJYmh1LbdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=bT3vGYuiIqkgNAks/bCxfdByo+2ZuYfausCoOMk3k1hiNEHziegyzbqH7lBTyTdKE Fvete8/DYT6IAUXtDQ9fOkUAIj9fQSxM4ZsQnJjde84aqkwssifdt941i99PlGyXOc EbuSpwu6Yq9ntd9yy4Muv8ky4ctkny5m+aDi09ak= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 45090F805EF; Tue, 14 Nov 2023 21:12:13 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 0AE3AF805F0; Tue, 14 Nov 2023 21:12:12 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 39394F805B6; Tue, 14 Nov 2023 21:11:56 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A89B4F8022B for ; Tue, 14 Nov 2023 21:11:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A89B4F8022B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=jUOPQ9Bx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699992708; x=1731528708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZVd8JR7JWwIAD73tuYOePPRkfmlids1h2RJYmh1LbdI=; b=jUOPQ9Bxd5HrNH78QaOUvJcWlWiGyuy4XvLKywI4v1XgFFpx4i2STd9B rL+5NMO3jfHwlZqELmWPQUd/tZirWhdsdHKXo5NCYwS23WRG2GtClJe0D M5cjZxvHCGdKMKzxpW+doioVtHZ58reJbR5YErGBcnaxx6oAmKCWDL7Io XoJJ8yWVW35yEuxvsXexpi8Er7qqiCpQUQSyfFEk2I5fTFYdY2H3ViD4A wLi88EUTyqYP8ixItPLbvTBJ4I/9UIEQoMcfh+I6idSz8mAcfkfpIidr+ Q71v07ohrrZoJt91VLf3HVpLiJjAUeDQuMP8shgiD3FuvdtnOOJU5qa2u A==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="381134764" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="381134764" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 12:11:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="855422444" X-IronPort-AV: E=Sophos;i="6.03,302,1694761200"; d="scan'208";a="855422444" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by FMSMGA003.fm.intel.com with ESMTP; 14 Nov 2023 12:11:43 -0800 From: Cezary Rojewski To: broonie@kernel.org, tiwai@suse.com, perex@perex.cz Cc: alsa-devel@alsa-project.org, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, linux-sound@vger.kernel.org, Cezary Rojewski Subject: [PATCH v3 12/16] ASoC: SOF: Intel: Switch to new stream-format interface Date: Tue, 14 Nov 2023 21:13:13 +0100 Message-Id: <20231114201317.1348066-13-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231114201317.1348066-1-cezary.rojewski@intel.com> References: <20231114201317.1348066-1-cezary.rojewski@intel.com> MIME-Version: 1.0 Message-ID-Hash: FNBMELY4CWFBZYYBC4ZF2YV7SAMEETAX X-Message-ID-Hash: FNBMELY4CWFBZYYBC4ZF2YV7SAMEETAX X-MailFrom: cezary.rojewski@intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: To provide option for selecting different bit-per-sample than just the maximum one, use the new format calculation mechanism. Signed-off-by: Cezary Rojewski --- sound/soc/sof/intel/hda-dai-ops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c index 87935554b1e4..f46a28b13073 100644 --- a/sound/soc/sof/intel/hda-dai-ops.c +++ b/sound/soc/sof/intel/hda-dai-ops.c @@ -208,14 +208,15 @@ static unsigned int hda_calc_stream_format(struct snd_sof_dev *sdev, struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); unsigned int link_bps; unsigned int format_val; + unsigned int bps; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) link_bps = codec_dai->driver->playback.sig_bits; else link_bps = codec_dai->driver->capture.sig_bits; + bps = snd_hdac_stream_format_bps(params_format(params), SNDRV_PCM_SUBFORMAT_STD, link_bps); - format_val = snd_hdac_calc_stream_format(params_rate(params), params_channels(params), - params_format(params), link_bps, 0); + format_val = snd_hdac_stream_format(params_channels(params), bps, params_rate(params)); dev_dbg(sdev->dev, "format_val=%#x, rate=%d, ch=%d, format=%d\n", format_val, params_rate(params), params_channels(params), params_format(params));