From patchwork Fri Mar 9 18:03:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 131197 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1285491lja; Fri, 9 Mar 2018 10:03:52 -0800 (PST) X-Google-Smtp-Source: AG47ELu/xvwyEYgpgSANM6v//HP0JMsfQ+6/lkeVo8s7G7mow8znk9ruG/IwE/JKESM8QtnTugHd X-Received: by 10.223.150.102 with SMTP id c35mr27139473wra.225.1520618632166; Fri, 09 Mar 2018 10:03:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520618632; cv=none; d=google.com; s=arc-20160816; b=xV1c9Y0iIiIz5cMJsOTcJ5gMmLUDw0F9MPWlatU4J6GaVQD9NfaPpWE5/zDYcKQsMR YLNF6TPuGtyZMGnUwlNBcW3gX9q3MIWcH2Hjs1SUb+8FfZyJbcXfR/y6+EiJ8WFVhTPX geob+ftrA+e5lPG9p7UYdjsdfmRzgRLMeeBLKmKeJdiBI85up7+k9q3oKk69QEgYa1FD cAaycjXLuiehEnTGEC1ozAH7FJwAhiQk66J9sYLEgZ/YJmE2HJKAjtV3n7/GLLiArlwv ny4MLbZuT5ziw/C8UVV0uSRvLsLDX7nlH4uwBFX5Y75bGkXEaIrH8WrrHaWofQbpuPnt HSDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=D6KHkYkV7ccttPfJmCKDXH0yQW2xMqwz6Eh39f4KcEs=; b=Xbly5R+6TeQHpS7xSHSYons/5NLVRsxObDhwHKhfO6/fGLs2G4hqpIni9C08CC/G9o BGDBi9Owolc+FHIeabnJRnqwFroP2EnASvlsmLskXooReR+MLzmtcUg8qyaoC44rigpE QsmYdCPtPDZ8NIx8nyNm75wrRhxBgoT8LBxbfsoHdSVdRBddt4bF+zOC6gBvmGYS/Wqr qL16xUYkxrGRWmZc7KAtk6/WoYcOgD2q1jAGW5EmjUWqmDhahJjHIGgU/5cVgvsIdzM5 FlCh86kkH2vobRZDegVU94ZEvlnedZ5Unwjlc1WKS0fEqncT6J4lVDiCktmtyLPu1pVp 1gHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=S6HNBkwI; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id s1si1222098wrf.447.2018.03.09.10.03.51; Fri, 09 Mar 2018 10:03:52 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=S6HNBkwI; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 646D826762C; Fri, 9 Mar 2018 19:03:48 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CDBCA267615; Fri, 9 Mar 2018 19:03:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id ABDF4267616 for ; Fri, 9 Mar 2018 19:03:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=DbLxS0H7WvbFZnpOuu4NoqYefDMQkQp69QYl0R7d7mI=; b=S6HNBkwILOGL 5cUJD/KbbcNxuLhwKKKo9omGTkxclhfnGsrgvt5UNBMd9Unb9Iks1WmMsaYEjd6Ban5zQTsoRegX2 pBTznuocrqXQSSdf4hglgx8QIm6clu2X89E09NqEjH/tCfT4Idb7g7gSLx0sW6pAsIiYVUwar8B4U JduYA=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1euMMn-0008KN-5t; Fri, 09 Mar 2018 18:03:41 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1euMMm-00020U-Ll; Fri, 09 Mar 2018 18:03:40 +0000 From: Mark Brown To: Vijendar Mukunda In-Reply-To: Message-Id: Date: Fri, 09 Mar 2018 18:03:40 +0000 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: amd: modifications in dma stop sequence" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: amd: modifications in dma stop sequence has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 17aa9521d0c2856808c54ca1144d5c708e748928 Mon Sep 17 00:00:00 2001 From: Vijendar Mukunda Date: Fri, 9 Mar 2018 20:51:32 +0530 Subject: [PATCH] ASoC: amd: modifications in dma stop sequence As per design, non-circular dma also need to be stopped explicitly for both playback and capture scenarios. Signed-off-by: Vijendar Mukunda Signed-off-by: Mark Brown --- sound/soc/amd/acp-pcm-dma.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 935c8fd42a7a..a1c6534455e6 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -949,12 +949,16 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) * completes : SYSRAM_TO_ACP_CH_NUM / ACP_TO_SYSRAM_CH_NUM */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + ret = acp_dma_stop(rtd->acp_mmio, + SYSRAM_TO_ACP_CH_NUM); ret = acp_dma_stop(rtd->acp_mmio, ACP_TO_I2S_DMA_CH_NUM); rtd->i2ssp_renderbytescount = 0; } else { ret = acp_dma_stop(rtd->acp_mmio, I2S_TO_ACP_DMA_CH_NUM); + ret = acp_dma_stop(rtd->acp_mmio, + ACP_TO_SYSRAM_CH_NUM); rtd->i2ssp_capturebytescount = 0; } break;