From patchwork Wed Jun 27 09:48:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 140311 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp643452ljj; Wed, 27 Jun 2018 02:48:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIHwn2klbYFNFjpwkJH3e8C0pJGwcydoTyX7OlMEIMZ/wQYRALez+MKHtENR7LJ0cfLxdX5 X-Received: by 2002:a17:902:89:: with SMTP id a9-v6mr5288748pla.326.1530092918872; Wed, 27 Jun 2018 02:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530092918; cv=none; d=google.com; s=arc-20160816; b=LVNYo+8x1RJAsIKu3ILHab9emGzFDIzAp3cGUMqW6eesAwDTmwsUsqAYp/iCrJrtJT z26b5RUYrRmlQc46LpcHv1aUwmC5vk3lsUrDGItSlRKS2jznVmJhUaQ0SYBdmxNvkwCO 0zd+bTnhnvVDKQqGL+ESooKQ5ToggyY5Ne1RX3zpjAdTRsOIcZQ+3D64ck5pLjSo8L7B VeQO5hI/NfyOC61Laufnr8RqHMu0tyltcfK1hC3dv8GjGbhULSpTzKGCWIyDBF/wv28i ORh0SPQCx8rrtiwQc3xQ06OMX1Ebeja2pMHroHz2sPoHenU6kNBuTz7njmVkt4ij26pt cbUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=ZOZL8sv6qCH03Q+wXqoFv8CXlSKcTxDgCU0PUbCkIic=; b=sIGWr3WrxI6+js/okbrjkmc3mpovwHOP5cqVy4iaKPvxejf6B44LDBSZEq/vgJwCNG kKSfcEuGcDcvtH2PdGc3a7DV5zLyzW+RjpzTkPuNuyk4zvTkzx/qPxvYY0rzxJ4o08n9 c26zNIxcc9JmGQ3WwdBvMQzzNbexyyEE+dWlDwUTCh/Xrg+MlPsH74JAZfF5AbTWufsI aB2lhjNg77Lrtjn18AfgNaQwAkR7MxBdk3lJxn6/SkmFsnrd1qYujYPPvAIIHNCRmCH8 huZRvtwejDlWaDlfJ/A1JcUCVWeEw/wWl/WxaPVeI8S4u33VapvR6bFcktsHnTVOI+p2 reGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=TBiRB1rC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b15-v6si3634308pfc.320.2018.06.27.02.48.38; Wed, 27 Jun 2018 02:48:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=TBiRB1rC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934191AbeF0Jsg (ORCPT + 31 others); Wed, 27 Jun 2018 05:48:36 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33014 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932135AbeF0Jse (ORCPT ); Wed, 27 Jun 2018 05:48:34 -0400 Received: by mail-wr0-f193.google.com with SMTP id k16-v6so1358982wro.0 for ; Wed, 27 Jun 2018 02:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=ZOZL8sv6qCH03Q+wXqoFv8CXlSKcTxDgCU0PUbCkIic=; b=TBiRB1rCC/H8kM1vnWAQMiCOAIHPgMJz0tRaVVSr6L4S57D/tsegWUDDtO5CW1MPNB lTPmZXPw3nU0fb7JrCX2mnVgpqLZszNf5MXH6SQ10LC19zc9h0nnOIhX6FT/EdXgPqeS Z7mDXAvtnYyinvG/tiwqyeL5/SKHR8x2O4Ukl5S45BgHG7pjONh19WXTWAyBXVM8CfKG 7pIjrK5lPvdaGuKFHqsx4AjQxqXTfQJHlhngq6erLD+jaODRiMLOGHMUvjuVP3R2QdoG mo8+Aa4bfvnqmNxxyBJ118iSR/Xd2DV0UbdfAg5li+OnrKFtZ8ib2MQAoWHI5bHD21rl nDOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZOZL8sv6qCH03Q+wXqoFv8CXlSKcTxDgCU0PUbCkIic=; b=qhJkt7If5FUV0I+lxAfAW0/1oEF90LbzzU6wpO2a3PfQ3SA6ObwNNmI0nkajWrKLGw qf4eSYpO6MhDLxvW6oZntZwGhwJ4Sz1GhVJtGNSz+TXfKyLuNB5m5Cj0IlkKs00SIO8g GtXSovrigZPzDMdoNr4Isd/COq1cqMAwF2q5hSTsPdZsDfTVEG0s3stDK+Pmmkf8xBnr fBPmERrE73IJkTTCO88ubb5EVTK5Ok3iWUWzI/3Ll0FqHqbdHAv9R85x4ISRwhA2hKbF PRzaMgtpNSnEtX4pcy7NBsvenwPQQT/LL92FbfMRi/0XEji8rh/qInAAzK0eTO8ziJJy AWGw== X-Gm-Message-State: APt69E34ow0kGGQPcnyvTRuDjs7BD5y0iu/aBEIuA6sfhcTAUFjJYoFm jjeqCjS9Cd9bREsRJB44IB3TIg== X-Received: by 2002:adf:9226:: with SMTP id 35-v6mr1331238wrj.44.1530092913769; Wed, 27 Jun 2018 02:48:33 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e13-v6sm5576824wrm.45.2018.06.27.02.48.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 02:48:33 -0700 (PDT) From: Jerome Brunet To: Liam Girdwood , Mark Brown Cc: Jerome Brunet , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Jiada Wang Subject: [PATCH] ASoC: dpcm: extend channel merging to the backend cpu dai Date: Wed, 27 Jun 2018 11:48:18 +0200 Message-Id: <20180627094818.5885-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extend dpcm_merge_chan to also check backend cpu dai channels capabilities. Apply the same policy as soc_pcm_init_runtime_hw() for multicodec links and only check cpu dai in this case. Cc: Jiada Wang Signed-off-by: Jerome Brunet --- Hi Mark, As you've probably noticed, this patch applies on top Jiada's patch pf4c277b817cc ("ASoC: soc-pcm: DPCM cares BE channel constraint") Regards. Jerome sound/soc/soc-pcm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.14.4 diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index b82d9ff1f47e..5141409ccaed 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1728,12 +1728,26 @@ static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream, list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) { struct snd_soc_pcm_runtime *be = dpcm->be; + struct snd_soc_dai_driver *cpu_dai_drv = be->cpu_dai->driver; struct snd_soc_dai_driver *codec_dai_drv; struct snd_soc_pcm_stream *codec_stream; - int i; + struct snd_soc_pcm_stream *cpu_stream; + + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + cpu_stream = &cpu_dai_drv->playback; + else + cpu_stream = &cpu_dai_drv->capture; + + *channels_min = max(*channels_min, cpu_stream->channels_min); + *channels_max = min(*channels_max, cpu_stream->channels_max); + + /* + * chan min/max cannot be enforced if there are multiple CODEC + * DAIs connected to a single CPU DAI, use CPU DAI's directly + */ + if (be->num_codecs == 1) { + codec_dai_drv = be->codec_dais[0]->driver; - for (i = 0; i < be->num_codecs; i++) { - codec_dai_drv = be->codec_dais[i]->driver; if (stream == SNDRV_PCM_STREAM_PLAYBACK) codec_stream = &codec_dai_drv->playback; else