From patchwork Fri Apr 27 10:59:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 134572 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp568559lji; Fri, 27 Apr 2018 03:59:41 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrBuvUQZ655dK+rdx8buVjwPuP1XTBLOPxg1CKYeZLRKpBzqVu5HuSPPP1km5Vj8AdbJOOE X-Received: by 10.28.199.2 with SMTP id x2mr1155149wmf.57.1524826781306; Fri, 27 Apr 2018 03:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524826781; cv=none; d=google.com; s=arc-20160816; b=kOpAruPdikR9ZawPs7ieLs4SJS4En6+ILaXRCjcokPRp3lte48PN2+MF0FuJthoaR0 jHXVEpsFFhKgadfdzGGUKe5eD8HweCrKNWfBn4kprTCt1HvaS+WxX/DP7on4CrhX1GT1 KdH0JOhdRhyvpACNI51Juqpllw4dUNWkLNAPYi/7cMgLUwKgPD2YvgAZqjA8vrx965WL grBQUHZK2sdiHN0uf2ymUbc48zDdHNtAESRBGiFWM84uoH/PK1rgWJ3hGa9U/OP4qstk E37378Qj6nc+A3Py8Ph1oh1tlY9TMEWoM2RSo6OjBT67a6iL+IBuutcvOe94kM6nOQZI Vssw== 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=DvAch8v41hGaaKdUmfUCGEd7MIUFGvCOp1VPF+IFLpQ=; b=jknjnXzX488m1MJEAXvsAXjHNJoR1Ye7rEKe0c11ImGXsSY47ZBLg6dzr2w6bVy1gC S3BNQW6cy1+4qTT1U0SDuRGfI96pNPQ8NMaIvifXdcv4Pwm/rCjktmhBt8N2U/hsMXlE HjMKK1CCZ+eD9/VII/ScW85f1aoUSCRslTqA5xUbi3ZVvF0n6UIEL1hzP+/HyumCsPu3 Z06WxMxm+w+xSEbea42NFtnProElh58Sm5pGXwaeVKg4yZg/csnv4RNEEw/w3eSEb5bK 9GebNgCzr2Db2brNLw4qz6qpGplNAxJV4NylQ2G9wsqFIuE+UADFyOf6Sc+TpDqZlvtP g9ZQ== 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=mAXoanF+; 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 p65si648923wmp.218.2018.04.27.03.59.41; Fri, 27 Apr 2018 03:59:41 -0700 (PDT) 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=mAXoanF+; 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 54CB62678D5; Fri, 27 Apr 2018 12:59:35 +0200 (CEST) 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 623BC2678C2; Fri, 27 Apr 2018 12:59:32 +0200 (CEST) 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, RCVD_IN_DNSWL_NONE, SPF_PASS 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 D1B38267860 for ; Fri, 27 Apr 2018 12:59:30 +0200 (CEST) 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=Y3y4ayGGIUVyVRFeKYI0EoIJ+QHUgCAh5PaUb00dOko=; b=mAXoanF+xJ5k XCLFYvk0UCeIYxeHyIuL1UfQemEV8QLAn6MZ2Gp9WzyUJeIC2olwxL+tZBtIQI4PdNuZP7Irw4qtn lvC7F5XKL7wJnjb3LR0k2EhbrAFhDOnyr2i9alSDjYdkxpbFhA9j03qMB5zmNMwEO8m+4yWEj57ig 0HqwA=; 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 1fC165-0007g7-3D; Fri, 27 Apr 2018 10:59:25 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1fC164-0003ui-Ea; Fri, 27 Apr 2018 11:59:24 +0100 From: Mark Brown To: Kai Chieh Chuang In-Reply-To: <20180427021135.16002-1-kaichieh.chuang@mediatek.com> Message-Id: Date: Fri, 27 Apr 2018 11:59:24 +0100 Cc: alsa-devel@alsa-project.org, ryder.lee@mediatek.com, wsd_upstream@mediatek.com, chipeng.chang@mediatek.com, garlic.tseng@mediatek.com, Hidalgo.Huang@mediatek.com, broonie@kernel.org, linux-mediatek@lists.infradead.org, PC.Liao@mediatek.com, kaichieh.chuang@mediatek.com Subject: [alsa-devel] Applied "ASoC: mediatek: preallocate pages use platform device" 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: mediatek: preallocate pages use platform device 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 58edf3255ca3025444c016241611453585453089 Mon Sep 17 00:00:00 2001 From: Kai Chieh Chuang Date: Fri, 27 Apr 2018 10:11:35 +0800 Subject: [PATCH] ASoC: mediatek: preallocate pages use platform device preallocate pages should use platform device, since we set dma mask for platform device. Signed-off-by: KaiChieh Chuang Signed-off-by: Mark Brown --- sound/soc/mediatek/common/mtk-afe-platform-driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/soc/mediatek/common/mtk-afe-platform-driver.c index 404fbe19e1a3..d046ea8e543b 100644 --- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c +++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c @@ -56,14 +56,14 @@ static const struct snd_pcm_ops mtk_afe_pcm_ops = { static int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd) { size_t size; - struct snd_card *card = rtd->card->snd_card; struct snd_pcm *pcm = rtd->pcm; struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); size = afe->mtk_afe_hardware->buffer_bytes_max; return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, - card->dev, size, size); + rtd->platform->dev, + size, size); } static void mtk_afe_pcm_free(struct snd_pcm *pcm)