From patchwork Thu Nov 30 18:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172047 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp616650vqy; Thu, 30 Nov 2023 11:07:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZWtyzP/cVv9f0/uH4z1Ccr8COwHotJEisga+eFOBScRoyAMszsFQsXbpXLMNacunVnCNj X-Received: by 2002:a05:6a20:d396:b0:163:5bfd:ae5b with SMTP id iq22-20020a056a20d39600b001635bfdae5bmr26573873pzb.15.1701371239541; Thu, 30 Nov 2023 11:07:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701371239; cv=none; d=google.com; s=arc-20160816; b=G1jPlDjqxdVMPF2wQEONKDM2h0qm9BmjXS8x0rTU2Z86KFjZnsXsMaYZiTH5YSVlPY ZBtx3c0v1zHNSv8dn3AOE+ZHueh9l0UuvdUMYPnwKFqPGzRSDg8ig6SWCgFwp8rKHjmZ cdnRkUXs1lMlkPoiDCtflZ0TMrtiifu/n6Rd3xK+2/lwxJtvi4A3td2Fbf/hwreaNPYG Q/GQphArxuteXuNx1Uko1yzMY05XueZp/AdX2y7I6H1/kEyCtVCcG1JAx+tbFQdcHUAa 0Z6Z8k1aH2IU5OJ9vjYIa6R8TnfGZxcZ0Qf/b5PIEYeFehEWQRwYHEF3/5TA3VAISFWy je3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=lXudH2HG2xmMsF2AZYeU29keOXpIbD/Sz/H3EjwBzHUIwxZC2oX+sJZQvn3ggpQ7wn PuX9FwCLNrYvFlKNvsdNrqpmk3mjp6inXOHbdgT7p1c8yjTIDkHzubv/8iNJrBNpCtkK zEz3tne5RKLr2mzIUGxAQB3INFwxFG7eANguadud3vAee1ysrapBmYZecQmjnNIsG2hN H7ctcFSpsE7iywhHrhAXECGrdp9J8Oc+3WbbGe9t9LwZL/WxtJ1cFqfFAkGhlQQNFbpC 0xEvAG4t1IyiY7dHH1YtzMVjL/rIYC20aIYd3BvMoUNlE2uP0TB7l0P9J3YWpqKF78zS 2aQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqNWdBgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bj10-20020a056a02018a00b005c602ff4069si1961073pgb.552.2023.11.30.11.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:07:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rqNWdBgd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 9ED6580D15A0; Thu, 30 Nov 2023 11:07:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346784AbjK3TGv (ORCPT + 99 others); Thu, 30 Nov 2023 14:06:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230045AbjK3TGu (ORCPT ); Thu, 30 Nov 2023 14:06:50 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE6C5194 for ; Thu, 30 Nov 2023 11:06:55 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3332e351670so273035f8f.0 for ; Thu, 30 Nov 2023 11:06:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701371214; x=1701976014; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; b=rqNWdBgdbzf5iJ4AJT928zTbxfEETGW4IyF2uhAZ/Y0OA00FRHNhGRAieqfwZ37+HQ 03he86pEpNvSTD+XOFXiCZHXgRcCZaCC4aJcXifJuMxEyN1XwBiiF0SqITP9WHYKllpi 45LrLoMKiq07iUd2NKk+CmqL48ufK1bEuQaFtjg0Itd1yjE5Un+PHVIaW1cSoJPnUrks BV6jKrfZJoxM1jzC7Jg2ZV4RmNPix4ko5NdwIej/j5WS3XRX+mii78LdIhWXyv0OchBz u1ldibH+j9CErjc8TINM4wD70BM8O03XOrObahz5JqwmYtLmC8ma76g08GMCIws4+qJY na0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701371214; x=1701976014; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7hWM7V+ZExvAnFj1W1dKLDuXcl2XOV1nsx6wXsgycfE=; b=U5CO6H9EnRx75xgfGaVEkX4mahMFDJXlrOrQ4nY63BdFWIf7VH/iYxSFvclaLxE07I t3oD1Ye5dQNfs3TekpxqZUTubz0/dmO7MRFRNOCpAzDTTvvuk80kYIFJ3O5Chon7jwov m3AbqOnMMdlKml9IUScTxVGTEu67BmGBij0GgTRWkEBvLTfYZh90A0AAKXIaQoQ77DLm 0P9/4fne15DsbmpNwPqg9fhMpbyP/QZ3AnATNrs0hG9GZeiGQn52Si45e2GXzY+IBGpi Xlz7Tbq/1vw0Q8JvC5xySENWXkBVaiYF3iwwqfl2oH1PCPTUlLBMUGpHR+EIr6JdQ+Tj m2VA== X-Gm-Message-State: AOJu0Yz3JDfPR5rC6cCiuNMSI3t7xKiTAJvFxyIc00BMitQYwjcwJbfP 1+sLV6cQ3MZ7PpbAiiRq6RRr95ov2+L4UnKLfencXg== X-Received: by 2002:a17:906:b88f:b0:a19:a1ba:bab7 with SMTP id hb15-20020a170906b88f00b00a19a1babab7mr5512ejb.93.1701367681837; Thu, 30 Nov 2023 10:08:01 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id y16-20020a170906559000b009a1dbf55665sm926713ejp.161.2023.11.30.10.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 10:08:01 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 1/3] ASoC: qcom: audioreach: Commonize setting channel mappings Date: Thu, 30 Nov 2023 19:07:56 +0100 Message-Id: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 30 Nov 2023 11:07:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784017049147171850 X-GMAIL-MSGID: 1784017049147171850 Move code assigning channel mapping values to a common helper function. This simplifies three out of four cases, with the last case using incompatible type (uint16_t array instead of uint8_t array). Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. New patch --- sound/soc/qcom/qdsp6/audioreach.c | 35 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 5974c7929dd3..3db5ff367a29 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -267,6 +267,16 @@ void *audioreach_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token } EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt); +static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels) +{ + if (num_channels == 1) { + ch_map[0] = PCM_CHANNEL_L; + } else if (num_channels == 2) { + ch_map[0] = PCM_CHANNEL_L; + ch_map[1] = PCM_CHANNEL_R; + } +} + static void apm_populate_container_config(struct apm_container_obj *cfg, struct audioreach_container *cont) { @@ -864,12 +874,8 @@ static int audioreach_set_compr_media_format(struct media_format *media_fmt_hdr, mp3_cfg->endianness = PCM_LITTLE_ENDIAN; mp3_cfg->num_channels = mcfg->num_channels; - if (mcfg->num_channels == 1) { - mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L; - } else if (mcfg->num_channels == 2) { - mp3_cfg->channel_mapping[0] = PCM_CHANNEL_L; - mp3_cfg->channel_mapping[1] = PCM_CHANNEL_R; - } + audioreach_set_channel_mapping(mp3_cfg->channel_mapping, + mcfg->num_channels); break; case SND_AUDIOCODEC_AAC: media_fmt_hdr->data_format = DATA_FORMAT_RAW_COMPRESSED; @@ -1089,13 +1095,8 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, media_cfg->q_factor = mcfg->bit_width - 1; media_cfg->bits_per_sample = mcfg->bit_width; - if (num_channels == 1) { - media_cfg->channel_mapping[0] = PCM_CHANNEL_L; - } else if (num_channels == 2) { - media_cfg->channel_mapping[0] = PCM_CHANNEL_L; - media_cfg->channel_mapping[1] = PCM_CHANNEL_R; - - } + audioreach_set_channel_mapping(media_cfg->channel_mapping, + num_channels); rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); @@ -1153,12 +1154,8 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, cfg->endianness = PCM_LITTLE_ENDIAN; cfg->num_channels = mcfg->num_channels; - if (mcfg->num_channels == 1) - cfg->channel_mapping[0] = PCM_CHANNEL_L; - else if (num_channels == 2) { - cfg->channel_mapping[0] = PCM_CHANNEL_L; - cfg->channel_mapping[1] = PCM_CHANNEL_R; - } + audioreach_set_channel_mapping(cfg->channel_mapping, + num_channels); } else { rc = audioreach_set_compr_media_format(header, p, mcfg); if (rc) { From patchwork Thu Nov 30 18:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172085 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp638452vqy; Thu, 30 Nov 2023 11:42:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IE7XryNwlwmGHo6N9MdnLe+Lw6zZmVwUyll5Xh6YAAVvsUYpT6caR/H3lbwDdAgIeVIXRH2 X-Received: by 2002:a05:6a20:8f19:b0:188:39e:9054 with SMTP id b25-20020a056a208f1900b00188039e9054mr27505492pzk.6.1701373358869; Thu, 30 Nov 2023 11:42:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701373358; cv=none; d=google.com; s=arc-20160816; b=OfZhN5bRrhYuz9pK3Tqd6D4D3/Oj3PKPodfEVqk7Zi4Kzw4teTFZj9d9jCWTBPAJbH pttZpbfb0d+v/knMFvKCFf2nIDbRkBY4n9dBeBeVNWQobOIa8ng3tmo97E+wAHdaAjZd 88rJxXw3b8luUWGeDi14rq7IW7dWgNDQrvrHIcz0Q49sUdUezH6q8gz/FLDMUIgpPi/j LXvAxWvZnx/iiuc1ki6b5vqoAd3JSZzSs/NaiDvKeKfgcLrq+nBSLTca+11CBNRrM+3l NIqcQ4rDu1fGkS6jt6ch1bFY3qUcNF7HEUU/AEeJ/47LbrVAsbx/y2tbX9rfkGPiVs3B LGwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=AC9X+I2DWGil+KYfObDh0oa4Sp4cVvyRNcYSz6qi/GY=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=0slKAK0iGv1TBu1Cfygcvkl6u47kQFalaxUPEutXHS6fbwzimlnjKJsg9urw8r2KbK zvbKTFCHAze8uUeMm9d2a9FWvlMxPNKw20EOJKA17bWkERNuyebhZo0maJ2ctfcVKZeN 0R+wmRCHfX/7geWKu0TzIg9EoPqTNn7dkK36/6q+Pjv7Oau8NDtMRzQJuTb2HBvrYAVn nvCvr5G+qb/AOFOnbm1EYyIikdFfjYjfee+h1DgLT5QEJuYtFf9Fdv1+tbCWF/JbSjuE m0itf5+4BC7X5S4Fuh1FtzYID/VBh0qdYy9r90tBk2qvpf9iJXwuUE7AZKpfAI3crsp7 b6kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XyrPnP5k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id f23-20020a63f117000000b0059779ae5899si1937120pgi.836.2023.11.30.11.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:42:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XyrPnP5k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 7594B82DDF9D; Thu, 30 Nov 2023 11:42:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235307AbjK3TmS (ORCPT + 99 others); Thu, 30 Nov 2023 14:42:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjK3TmQ (ORCPT ); Thu, 30 Nov 2023 14:42:16 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CEEA10FD for ; Thu, 30 Nov 2023 11:41:23 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-50bd4fcbde1so625910e87.1 for ; Thu, 30 Nov 2023 11:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701373281; x=1701978081; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AC9X+I2DWGil+KYfObDh0oa4Sp4cVvyRNcYSz6qi/GY=; b=XyrPnP5kk1V1SqjzoAoDihM83FBpyx0xC3kh2Yj7+bxDBMe+6AcH87QID6JYtQPoai YCrGmhes3gHbEl62pjDqe3nfPNz081SOAKjSY1xAJJy9ZytJ96e08FC2K8FuEmPM6hJ1 Geu0mw3a8prcLLy1aFoafL6Jaud/ayKNSUks7TCSZx4ggizFiwkHqXjB/R0AEN1hEctX J+wu9hFVUOo7u7y0SJ6gNXeiGamchpIJfiL6ZUrEqKWFEBUcVd8ZaUM3wYDZTvK2uQxg 3VJ7Wc2RK5BllMaMq4XfJy7s7K0c2dH75WCcZMh7K6vpoLW65OlY+at6yWdaWO6nlakb xo9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701373281; x=1701978081; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AC9X+I2DWGil+KYfObDh0oa4Sp4cVvyRNcYSz6qi/GY=; b=NJAsATRevxLA64TVo66lmL6C+duChMehHRxfhHlKdHtgxMBusVAk4M8X2wKCKPhSTv Im/qVUlXK0qh5YvFQU/WSgO9AWk6U4mVzN1isPppUeHbHnofCy2NR7zy5YbaQNMyIqpQ /uyBstnOFpAp8XLlQusPyeXST7Y8AspDjEOrM8Fgebp6LhM4pUJaGEsQnIW3zBbuAAbq ONcY2MB1wp1piZxXGYQ+Vg/zSEB0QTROPIXP3b7D34wRxx/Dn6r/C7X0kimjnseOa253 put9XR6d2wXFpE7Oo6q57LllOn5pUWOGyojy2Ra995LZfHBFKRzXW+cS+SIrcre8Wo6E QCIg== X-Gm-Message-State: AOJu0Yxuty+BR1Y4uY3xaoqoJG2hb3HSmhQ+ysYVd+4FICG7/zR8Vrze q/09D9EfchCc1NM9NTS8TmuaEx4eKYUYQAPIcPtP4w== X-Received: by 2002:adf:fdcc:0:b0:333:2fd2:68fa with SMTP id i12-20020adffdcc000000b003332fd268famr12459wrs.141.1701367693588; Thu, 30 Nov 2023 10:08:13 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id y16-20020a170906559000b009a1dbf55665sm926713ejp.161.2023.11.30.10.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 10:08:13 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 2/3] ASoC: qcom: audioreach: drop duplicate channel defines Date: Thu, 30 Nov 2023 19:07:57 +0100 Message-Id: <20231130180758.212172-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> References: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 30 Nov 2023 11:42:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784019270922364221 X-GMAIL-MSGID: 1784019270922364221 q6apm.h header already defines channel mapping values, so drop duplicated devices from audioreach.h. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. New patch --- sound/soc/qcom/qdsp6/audioreach.c | 12 ++++++------ sound/soc/qcom/qdsp6/audioreach.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 3db5ff367a29..5c7113d46b6f 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -270,10 +270,10 @@ EXPORT_SYMBOL_GPL(audioreach_alloc_apm_cmd_pkt); static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels) { if (num_channels == 1) { - ch_map[0] = PCM_CHANNEL_L; + ch_map[0] = PCM_CHANNEL_FL; } else if (num_channels == 2) { - ch_map[0] = PCM_CHANNEL_L; - ch_map[1] = PCM_CHANNEL_R; + ch_map[0] = PCM_CHANNEL_FL; + ch_map[1] = PCM_CHANNEL_FR; } } @@ -839,10 +839,10 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, media_format->num_channels = cfg->num_channels; if (num_channels == 1) { - media_format->channel_mapping[0] = PCM_CHANNEL_L; + media_format->channel_mapping[0] = PCM_CHANNEL_FL; } else if (num_channels == 2) { - media_format->channel_mapping[0] = PCM_CHANNEL_L; - media_format->channel_mapping[1] = PCM_CHANNEL_R; + media_format->channel_mapping[0] = PCM_CHANNEL_FL; + media_format->channel_mapping[1] = PCM_CHANNEL_FR; } rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h index e38111ffd7b9..2c82917b7162 100644 --- a/sound/soc/qcom/qdsp6/audioreach.h +++ b/sound/soc/qcom/qdsp6/audioreach.h @@ -158,8 +158,6 @@ struct param_id_enc_bitrate_param { #define MEDIA_FMT_ID_PCM 0x09001000 #define MEDIA_FMT_ID_MP3 0x09001009 -#define PCM_CHANNEL_L 1 -#define PCM_CHANNEL_R 2 #define SAMPLE_RATE_48K 48000 #define BIT_WIDTH_16 16 From patchwork Thu Nov 30 18:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 172074 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp632459vqy; Thu, 30 Nov 2023 11:31:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IF2PLaW4z04f6+FQN7WyXpJqvPUjIRZ/H1TCk/wdo/Ry1LIlxFp3ld+RTLXC283DCnlpKYu X-Received: by 2002:a05:6808:d47:b0:3af:709c:1b2b with SMTP id w7-20020a0568080d4700b003af709c1b2bmr650743oik.32.1701372696932; Thu, 30 Nov 2023 11:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701372696; cv=none; d=google.com; s=arc-20160816; b=l248WTRHkZWanb+Ei8nPM+U/rg/F6tzGmxcS+3va/4qkaZ7GEzkN79bS4ObcL4u300 dBFiAzNpVStFlFMUnvve3fqnaZS3yv89rKGAQmW0w3S+AQeavt0x2RXrsm1qZDhDiYBK EpBZoZKzM61rjSHuoV+9pi24Lb3mNsbKDXiCIhc7RdfirVnEQdLL5m82Dkeo/7AIit98 waQwv6ifjCmKosx5p/92xEE2UaFishPMzfNFMq68prZWwx9g6IhM1mqTj2dBiA5EMViW 7kR75cTT928WYEadsCJmKbC7rSQsg9M531YNdZgMShmph64Zj+zb9Nii5jG7tC7LkT4S eYNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=07QYxEgyoqmQ3Q1vq77DMefnw2mMccatpZsNXnEAueU=; fh=0HKUKyvbKDnDV00Pl9ks4ZRxOdrxlGdR0/GQO3201mo=; b=FVItlr1aOwMHY9OYWxRkJv1CIPJDf6vbmv1Wo8coN0+XnMC+B7CTa/QOM0AvQr7OrF kNIUgesb7guaFcs+T3QY1pVooLXEsq5vczMjbznShCUgd48CFAQkLow5z82cz67pbYgz E37vVWOYXOPY0mqiHTa6L4LCgBRDk/ZAIbOY2Zv4I4mea8QEZoEmy7PDNZtsKI6N7v2W yKP0RaGrNNpY7bRdgiKA8tFse8q17hAb8Wo5KeP0R6+hMt2tFow+IRLcTG/XMeeUX1lV 5F8loSicLyvgY9hKfxi+VyK6v3eXdxlNLou4LG+YG1HHNuRd7cjXiCC+nsLMaknwhPDE 7zNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AMuqyq8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id a3-20020a630b43000000b005859e22461csi1938699pgl.817.2023.11.30.11.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 11:31:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AMuqyq8D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id CE26B8026A78; Thu, 30 Nov 2023 11:31:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376418AbjK3Tav (ORCPT + 99 others); Thu, 30 Nov 2023 14:30:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376490AbjK3Tao (ORCPT ); Thu, 30 Nov 2023 14:30:44 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5936D40 for ; Thu, 30 Nov 2023 11:30:50 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a132acb67b5so190121866b.3 for ; Thu, 30 Nov 2023 11:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701372649; x=1701977449; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=07QYxEgyoqmQ3Q1vq77DMefnw2mMccatpZsNXnEAueU=; b=AMuqyq8Di2KMd1hQ/tuSmaY+EisuXhI9qaqpeIiIjbgEdJ4bkCvH++dVzhssPk8fkK FwgkOtaCGMh8CzJUZ4DeZo8lgcXQn3UfSnF1+QJUw9rwaMU4MxlzZR0zN8gciUAXbqMA UppN7dNuSmggeosKfS2xJqUZzrTNRnUx0u//ojsSuYeCSDejGfLVZwEvd+sZkwkRps7y GgdYIpbXhAZWZijqYuwovVO93Mu5a4gXM74vybrBkQ2oF6HVbbSKJwwPA88hMiInlqOQ ZEDt6oElhzZUugzJDHga3bu1/KcYTInVDkKL/Lvt9IwUq1+50ci/T3kUOQQaxC9JVqns A7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701372649; x=1701977449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=07QYxEgyoqmQ3Q1vq77DMefnw2mMccatpZsNXnEAueU=; b=bgAao4RNMLTQWFi8Zw/SNLUJKQTKIoRegqcld/KZgrjgmZqDyratygIbaj7ql8xXfD ijMrQbPZE3JtqGaK5AXXY3MCuEG6s/C/6KQZ2ru98mcydg2hbBua1T7U8erqCYXKaFsU jrSk8nXue8+NwbS27+ry+Cl7JK1BvOIVYfWRtqTj+d496ZhfbXID4co/DGt6uSNhhwQt HchaTprGY0kLHyT7a93lGclu5cf8qyGZY9NfW8XguMkR3BDUM8QRRyzEvTReXeV7iCU1 kwn2UvCOU5NYHks6Kr21ZiMpza8IIgVRN46x/eqpXhdYuGywqgW/pTIDcOk9rIGFs77A Iw7g== X-Gm-Message-State: AOJu0YxfQDpLGq6FPoYjVf33SJBsG5t811LxSZsJTMxquXWTVqVIaPwm 5nWOA8GHmPmW1A8ZJlJbvFXG5/xAx8VxqaX79U2+DA== X-Received: by 2002:a17:906:ca2:b0:9fe:3bb6:99fe with SMTP id k2-20020a1709060ca200b009fe3bb699femr80697ejh.2.1701367698155; Thu, 30 Nov 2023 10:08:18 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id y16-20020a170906559000b009a1dbf55665sm926713ejp.161.2023.11.30.10.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 10:08:17 -0800 (PST) From: Krzysztof Kozlowski To: Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , alsa-devel@alsa-project.org, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 3/3] ASoC: qcom: audioreach: Add 4 channel support Date: Thu, 30 Nov 2023 19:07:58 +0100 Message-Id: <20231130180758.212172-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> References: <20231130180758.212172-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 30 Nov 2023 11:31:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784018577061769455 X-GMAIL-MSGID: 1784018577061769455 Add support four channel streams. Map channel 3 and 4 to left/right surround ("quad(side)" from ffmpeg standard channel list) to match what is in qdsp6/q6dsp-common.c driver. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Rebase to avoid duplicate code. v1: https://lore.kernel.org/alsa-devel/20231020084919.18628-1-krzysztof.kozlowski@linaro.org/ quad(side): https://trac.ffmpeg.org/wiki/AudioChannelManipulation#Listchannelnamesandstandardchannellayouts --- sound/soc/qcom/qdsp6/audioreach.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c index 5c7113d46b6f..5291deac0a0b 100644 --- a/sound/soc/qcom/qdsp6/audioreach.c +++ b/sound/soc/qcom/qdsp6/audioreach.c @@ -274,6 +274,11 @@ static void audioreach_set_channel_mapping(u8 *ch_map, int num_channels) } else if (num_channels == 2) { ch_map[0] = PCM_CHANNEL_FL; ch_map[1] = PCM_CHANNEL_FR; + } else if (num_channels == 4) { + ch_map[0] = PCM_CHANNEL_FL; + ch_map[1] = PCM_CHANNEL_FR; + ch_map[2] = PCM_CHANNEL_LS; + ch_map[3] = PCM_CHANNEL_RS; } } @@ -843,6 +848,11 @@ static int audioreach_mfc_set_media_format(struct q6apm_graph *graph, } else if (num_channels == 2) { media_format->channel_mapping[0] = PCM_CHANNEL_FL; media_format->channel_mapping[1] = PCM_CHANNEL_FR; + } else if (num_channels == 4) { + media_format->channel_mapping[0] = PCM_CHANNEL_FL; + media_format->channel_mapping[1] = PCM_CHANNEL_FR; + media_format->channel_mapping[2] = PCM_CHANNEL_LS; + media_format->channel_mapping[3] = PCM_CHANNEL_RS; } rc = q6apm_send_cmd_sync(graph->apm, pkt, 0); @@ -1063,7 +1073,7 @@ static int audioreach_pcm_set_media_format(struct q6apm_graph *graph, int rc, payload_size; struct gpr_pkt *pkt; - if (num_channels > 2) { + if (num_channels > 4) { dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels); return -EINVAL; } @@ -1117,7 +1127,7 @@ static int audioreach_shmem_set_media_format(struct q6apm_graph *graph, struct gpr_pkt *pkt; void *p; - if (num_channels > 2) { + if (num_channels > 4) { dev_err(graph->dev, "Error: Invalid channels (%d)!\n", num_channels); return -EINVAL; }