From patchwork Sat Oct 13 15:17:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69F0F17E1 for ; Sat, 13 Oct 2018 15:18:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D87A28F6A for ; Sat, 13 Oct 2018 15:18:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B7A29ABE; Sat, 13 Oct 2018 15:18:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1312D28F6A for ; Sat, 13 Oct 2018 15:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726781AbeJMWyq (ORCPT ); Sat, 13 Oct 2018 18:54:46 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33496 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726294AbeJMWyp (ORCPT ); Sat, 13 Oct 2018 18:54:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eyxJkjl3ux4PWhRp8+cF0xRnH8kd79hW67RefGOvRXc=; b=edSt3tZAs8zCuCcDPpgW40mEkG //OfnNxjsu8TMbc2Uf3RjUpj9eEzxtFfC36J3Rhz3PPEQdt4srCAtrQAj274HCtSOJKEhMzZx1sLM hQzJtM5FnUcr6N+O+xkMHEmD79pJHFe4coZx3I+r8JrJqzWjGsT29Olz8z3D/q9copRRefayvz95P OPSY5c5/GiYjFyKCl43JQTEMd3n3j5bXNxG/kEGAovFNH0E5pPOilDb+t8rCwoyDnwelTn0bTEtJ6 ia9yOwuMQQlHXMsVJJjMIt5+AK7zSsjJaiKkM+mZtXaT9wopZmZRn6rTYcn3FZGNch2Cd385HRRdK 2IlUtkkQ==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfE-0004zc-FJ; Sat, 13 Oct 2018 15:17:12 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/8] cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent Date: Sat, 13 Oct 2018 17:17:00 +0200 Message-Id: <20181013151707.32210-2-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig Acked-by: Rafael J. Wysocki --- drivers/cpufreq/tegra186-cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/tegra186-cpufreq.c b/drivers/cpufreq/tegra186-cpufreq.c index 1f59966573aa..f1e09022b819 100644 --- a/drivers/cpufreq/tegra186-cpufreq.c +++ b/drivers/cpufreq/tegra186-cpufreq.c @@ -121,7 +121,7 @@ static struct cpufreq_frequency_table *init_vhint_table( void *virt; virt = dma_alloc_coherent(bpmp->dev, sizeof(*data), &phys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!virt) return ERR_PTR(-ENOMEM); From patchwork Sat Oct 13 15:17:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640275 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDF0369B4 for ; Sat, 13 Oct 2018 15:17:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBFEB29A8B for ; Sat, 13 Oct 2018 15:17:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D045429D2C; Sat, 13 Oct 2018 15:17:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63AC929B20 for ; Sat, 13 Oct 2018 15:17:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726960AbeJMWys (ORCPT ); Sat, 13 Oct 2018 18:54:48 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33512 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726294AbeJMWys (ORCPT ); Sat, 13 Oct 2018 18:54:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=VOOg2jZR93ZgSDWc4idp7gl5WiJmFFr+34LQzsxinKE=; b=RR1zzHcNLIADP7ppNXFDffWt00 YPuPqmMC1ELUMqtg5VnAv9hKrG5qadhYMoM2dmB83dRvlv/zTDhGK5sAJ3+jRhxV7mNO1j78bIgf0 P+DKgfeVtaI8y4B2CwDUq+2abRVU1OE2uWXY0O3Bm9aYO9029LxjpGCZin2MRtFgvtdzXwB9BPQtW lUS++vL5+97R7OQuSSOIfYms32ZwVTRTt0cmnyFmW19HEwrqsTQqlZ1N4HxoRIjHZHEvkghLVTp5Q 7Woq+BBP3MU3A0GcGpZY/ex+lsdXk1f6f8Hb7FPhtq2kDVXnoS1Wsmbx/YRVta75PhOqOQD+O38Rc M1MShsTQ==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfH-0004zy-7L; Sat, 13 Oct 2018 15:17:15 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/8] firmware: tegra: don't pass GFP_DMA32 to dma_alloc_coherent Date: Sat, 13 Oct 2018 17:17:01 +0200 Message-Id: <20181013151707.32210-3-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig --- drivers/firmware/tegra/bpmp-debugfs.c | 11 +++++------ drivers/firmware/tegra/bpmp.c | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/firmware/tegra/bpmp-debugfs.c b/drivers/firmware/tegra/bpmp-debugfs.c index f7f6a0a5cb07..567160897bac 100644 --- a/drivers/firmware/tegra/bpmp-debugfs.c +++ b/drivers/firmware/tegra/bpmp-debugfs.c @@ -218,12 +218,12 @@ static int debugfs_show(struct seq_file *m, void *p) return -ENOENT; namevirt = dma_alloc_coherent(bpmp->dev, namesize, &namephys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!namevirt) return -ENOMEM; datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!datavirt) { ret = -ENOMEM; goto free_namebuf; @@ -269,12 +269,12 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf, return -ENOENT; namevirt = dma_alloc_coherent(bpmp->dev, namesize, &namephys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!namevirt) return -ENOMEM; datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!datavirt) { ret = -ENOMEM; goto free_namebuf; @@ -422,8 +422,7 @@ int tegra_bpmp_init_debugfs(struct tegra_bpmp *bpmp) if (!root) return -ENOMEM; - virt = dma_alloc_coherent(bpmp->dev, sz, &phys, - GFP_KERNEL | GFP_DMA32); + virt = dma_alloc_coherent(bpmp->dev, sz, &phys, GFP_KERNEL); if (!virt) { ret = -ENOMEM; goto out; diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 14a456afa379..e6d2356ccec3 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -531,7 +531,7 @@ static int tegra_bpmp_get_firmware_tag(struct tegra_bpmp *bpmp, char *tag, int err; virt = dma_alloc_coherent(bpmp->dev, MSG_DATA_MIN_SZ, &phys, - GFP_KERNEL | GFP_DMA32); + GFP_KERNEL); if (!virt) return -ENOMEM; From patchwork Sat Oct 13 15:17:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D70F43CF1 for ; Sat, 13 Oct 2018 15:18:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA68628F6A for ; Sat, 13 Oct 2018 15:18:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE3A329A8B; Sat, 13 Oct 2018 15:18:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 703CD29BAA for ; Sat, 13 Oct 2018 15:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726988AbeJMWyv (ORCPT ); Sat, 13 Oct 2018 18:54:51 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33534 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726294AbeJMWyu (ORCPT ); Sat, 13 Oct 2018 18:54:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dY9ODyogq437nMXiPguhB7J6lfoETKSsvYTNXVNUP+c=; b=ZACDolTeSeVupiHaM53AlqO2Sc 4D7aafMn/ijnCNOex2KTxipFsxNURkj9nONycH94xUSSn+hFzDCuh6ZgtETK2oWTDHJfTjpREWl7e LhkvPgvdiexzKF+766QXUUhenqFxf7rDDWhdduAlCWejyRFWbcyzqsgLIzulnXQXcvdA192WnxULY BZmyqtLGH10YIUKzKph4JnZ87J1Lca4ZBmBj/cmA9/ya/sYiGYt1SILJAI9A2hlY7jKa/At2zS3+0 pLpCF9OW55poXtZU6JfYau36DaqxizjulOw/jaxU7ZD3fy/bIW3/DsT9CQAubRxK141GTu9/BjuAF J2fw9uTQ==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfJ-00050Z-UQ; Sat, 13 Oct 2018 15:17:18 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 3/8] spi: pic32-sqi: don't pass GFP_DMA32 to dma_alloc_coherent Date: Sat, 13 Oct 2018 17:17:02 +0200 Message-Id: <20181013151707.32210-4-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig --- drivers/spi/spi-pic32-sqi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-pic32-sqi.c b/drivers/spi/spi-pic32-sqi.c index bd1c6b53283f..ab53e461d80f 100644 --- a/drivers/spi/spi-pic32-sqi.c +++ b/drivers/spi/spi-pic32-sqi.c @@ -468,7 +468,7 @@ static int ring_desc_ring_alloc(struct pic32_sqi *sqi) /* allocate coherent DMAable memory for hardware buffer descriptors. */ sqi->bd = dma_zalloc_coherent(&sqi->master->dev, sizeof(*bd) * PESQI_BD_COUNT, - &sqi->bd_dma, GFP_DMA32); + &sqi->bd_dma, GFP_KERNEL); if (!sqi->bd) { dev_err(&sqi->master->dev, "failed allocating dma buffer\n"); return -ENOMEM; From patchwork Sat Oct 13 15:17:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D02D17E1 for ; Sat, 13 Oct 2018 15:17:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5012529A8B for ; Sat, 13 Oct 2018 15:17:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 446B829ABE; Sat, 13 Oct 2018 15:17:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0011929BAA for ; Sat, 13 Oct 2018 15:17:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726294AbeJMWyx (ORCPT ); Sat, 13 Oct 2018 18:54:53 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33546 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726320AbeJMWyx (ORCPT ); Sat, 13 Oct 2018 18:54:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ohQ5syK/otETP/Mb0BWb0FhcKVVuuwT6fRAqMl8W+4s=; b=qmkodix1qyB0dqneOvg4qfdTho JE2wMoT0niwTOisSSLI7PXDiX1NPoUmSmCbZZeVbJkAr2fLgT4uZXyPOYKeN1dE2UQXzT0QZ+6trM gjO3Jo10F5h0uYKsuoC4ilzPLtME9qKNVY2EI18m5A7ilzYC/Yb3tWBQkFjMpOxDyn156ZpQJ46Sd W75/vVV/BFyfSD8zKnW/iyqQGA1bvsVAlCNAzlYT7QTHFICXS3/No6HNfPL8ut67W+rLd8s/w2hnQ N+/U+kJeCeksz8N1KYJZpJDYrxbddCFHyuCP5l06z/jmzX84oY3BseZw+yRpIb0y8KCAYPj4MkWsP wz5ZDLGg==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfM-00051K-Hn; Sat, 13 Oct 2018 15:17:20 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 4/8] sound: hpios: don't pass GFP_DMA32 to dma_alloc_coherent Date: Sat, 13 Oct 2018 17:17:03 +0200 Message-Id: <20181013151707.32210-5-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig Reviewed-by: Takashi Iwai --- sound/pci/asihpi/hpios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c index 5ef4fe964366..7c91330af719 100644 --- a/sound/pci/asihpi/hpios.c +++ b/sound/pci/asihpi/hpios.c @@ -49,7 +49,7 @@ u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_mem_area, u32 size, /*?? any benefit in using managed dmam_alloc_coherent? */ p_mem_area->vaddr = dma_alloc_coherent(&pdev->dev, size, &p_mem_area->dma_handle, - GFP_DMA32 | GFP_KERNEL); + GFP_KERNEL); if (p_mem_area->vaddr) { HPI_DEBUG_LOG(DEBUG, "allocated %d bytes, dma 0x%x vma %p\n", From patchwork Sat Oct 13 15:17:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C52817E3 for ; Sat, 13 Oct 2018 15:17:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EC2228F6A for ; Sat, 13 Oct 2018 15:17:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82B7429BAA; Sat, 13 Oct 2018 15:17:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3168B29A8B for ; Sat, 13 Oct 2018 15:17:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727148AbeJMWy4 (ORCPT ); Sat, 13 Oct 2018 18:54:56 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33560 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726320AbeJMWy4 (ORCPT ); Sat, 13 Oct 2018 18:54:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tcC8xrkkOdyIZRtHgdxxUrp01s1PVG+ePaNmiszFAyg=; b=WK41U7flCvW82MAelHWTtdPOtK /HtgvrAUFK+N6b+mfJLbtt0e9MZBPKUn7j7Eb6VE/fiLebtC9e+QInYd1Ef2nkEdCSydOIMdoljMV fQwH6k+VN4jr90d7r/sX7jk/YoRn4tVWGaZu8XBtMVx4OwTMaFyNwerxrC3ePqKmmzAv6zzkcuXzB r9wNsEe6zKuHptbYDhRF8lk8+5tVR97/WQmq2fBXe30FwoPt70tHPkwd06vxxsm3GKE9dNnOITA1A Nnzn75ruKFLYEnmLD6g0NbTl8qBp8B1kaCYOgZhdO742cBkN0Ixw82dXZTsJ50R4kEL0vjeflFp4P /1Lkh9Sg==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfP-00051u-5q; Sat, 13 Oct 2018 15:17:23 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 5/8] sound: intel/sst: don't pass GFP_DMA32 to dma_alloc_coherent Date: Sat, 13 Oct 2018 17:17:04 +0200 Message-Id: <20181013151707.32210-6-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig Reviewed-by: Takashi Iwai --- sound/soc/intel/common/sst-firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 11041aedea31..1e067504b604 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -355,7 +355,7 @@ struct sst_fw *sst_fw_new(struct sst_dsp *dsp, /* allocate DMA buffer to store FW data */ sst_fw->dma_buf = dma_alloc_coherent(dsp->dma_dev, sst_fw->size, - &sst_fw->dmable_fw_paddr, GFP_DMA | GFP_KERNEL); + &sst_fw->dmable_fw_paddr, GFP_KERNEL); if (!sst_fw->dma_buf) { dev_err(dsp->dev, "error: DMA alloc failed\n"); kfree(sst_fw); From patchwork Sat Oct 13 15:17:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69D3817E3 for ; Sat, 13 Oct 2018 15:17:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5ACDE28F6A for ; Sat, 13 Oct 2018 15:17:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F86A29ABE; Sat, 13 Oct 2018 15:17:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0627329A8B for ; Sat, 13 Oct 2018 15:17:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727245AbeJMWy7 (ORCPT ); Sat, 13 Oct 2018 18:54:59 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33570 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727191AbeJMWy6 (ORCPT ); Sat, 13 Oct 2018 18:54:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=e1yvJYNep1THwrAkDEjv/oFZB/ZP1sXXao85vjBf4xY=; b=pDZBu+4OHXoUWcn6aI3vexvg65 KoVfbO4XZVKzTW+/H0kgUjQkvRkWhg31t6FAxzcPZuVrjQpcbSfGAW41kyoMlsAWTPLGiy/+ZhIAl l7LHwmnJvoz2TN7aDmgTzu0Br0hdg1YS6/oMUTE3eJg1Y8x+stmMyojqvAy0271S+4axj2JypC7iO RgcKt8oOjIZ+zzdEn8UlkJ+XN5M/bD1prAFoNPyOIm9Bxo8AlyN8cSKHw5jVxlyGyUowA9Y8nR2r3 op0YlnPQ07EirjVb8T4Z4bKigfEUGnPyEoZXASJWBz5VIPeQXwIM8SNEZMlD9pu0RRTHybsRec+B/ AZycX66w==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfR-00052p-ST; Sat, 13 Oct 2018 15:17:26 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/8] drm: sti: don't pass GFP_DMA32 to dma_alloc_wc Date: Sat, 13 Oct 2018 17:17:05 +0200 Message-Id: <20181013151707.32210-7-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig Reviewed-by: Benjamin Gaignard --- drivers/gpu/drm/sti/sti_gdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c index c32de6cbf061..cdf0a1396e00 100644 --- a/drivers/gpu/drm/sti/sti_gdp.c +++ b/drivers/gpu/drm/sti/sti_gdp.c @@ -517,7 +517,7 @@ static void sti_gdp_init(struct sti_gdp *gdp) /* Allocate all the nodes within a single memory page */ size = sizeof(struct sti_gdp_node) * GDP_NODE_PER_FIELD * GDP_NODE_NB_BANK; - base = dma_alloc_wc(gdp->dev, size, &dma_addr, GFP_KERNEL | GFP_DMA); + base = dma_alloc_wc(gdp->dev, size, &dma_addr, GFP_KERNEL); if (!base) { DRM_ERROR("Failed to allocate memory for GDP node\n"); From patchwork Sat Oct 13 15:17:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6DFBD17E1 for ; Sat, 13 Oct 2018 15:17:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FF7D28F6A for ; Sat, 13 Oct 2018 15:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 542B229ABE; Sat, 13 Oct 2018 15:17:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 080E328F6A for ; Sat, 13 Oct 2018 15:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727300AbeJMWzC (ORCPT ); Sat, 13 Oct 2018 18:55:02 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33580 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726320AbeJMWzB (ORCPT ); Sat, 13 Oct 2018 18:55:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=IVkBQvsZS3TE4cW5kvh+t4tiXvMmm+B1CJIcTNKU7uY=; b=hRd0LCPM/yewkRw5sWfXut1ZOo BWPFBKYDBcBjojSOcWY+qjGc66wMuNMA4zXuF11YN64RF8MXLpUoPZJR/OhztT5TzR3HFKFt4MZUZ UIMZVtluMQMJ62R9KLbFri0Dp+LIGKGoUCJadztJjBh48NIVG9Mu0ZDNtKllF1SxBlFQwJj5SQnE6 HAcKdRJHPjZ/+jOnp9GfOx/cu8x71vPP2PPrz/OZiPnxtu+JXvC2b68GRujibBKquViCZ+bYEQyXL D+OddSB2tXxBqZREZq3wqPE+p55zCor4j8AiYbX25YXiA/iqvIVCMoS5Vr6DOkRDIsaVqj1e3SdYP Ir7CzJqQ==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfU-00053L-M9; Sat, 13 Oct 2018 15:17:29 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 7/8] media: sti/bdisp: don't pass GFP_DMA32 to dma_alloc_attrs Date: Sat, 13 Oct 2018 17:17:06 +0200 Message-Id: <20181013151707.32210-8-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig Reviewed-by: Benjamin Gaignard --- drivers/media/platform/sti/bdisp/bdisp-hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/sti/bdisp/bdisp-hw.c b/drivers/media/platform/sti/bdisp/bdisp-hw.c index 26d9fa7aeb5f..4372abbb5950 100644 --- a/drivers/media/platform/sti/bdisp/bdisp-hw.c +++ b/drivers/media/platform/sti/bdisp/bdisp-hw.c @@ -510,7 +510,7 @@ int bdisp_hw_alloc_filters(struct device *dev) /* Allocate all the filters within a single memory page */ size = (BDISP_HF_NB * NB_H_FILTER) + (BDISP_VF_NB * NB_V_FILTER); - base = dma_alloc_attrs(dev, size, &paddr, GFP_KERNEL | GFP_DMA, + base = dma_alloc_attrs(dev, size, &paddr, GFP_KERNEL, DMA_ATTR_WRITE_COMBINE); if (!base) return -ENOMEM; From patchwork Sat Oct 13 15:17:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10640295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90E4517E1 for ; Sat, 13 Oct 2018 15:17:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82ADD28F6A for ; Sat, 13 Oct 2018 15:17:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76FA129ABE; Sat, 13 Oct 2018 15:17:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CFFA28F6A for ; Sat, 13 Oct 2018 15:17:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727384AbeJMWzF (ORCPT ); Sat, 13 Oct 2018 18:55:05 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33594 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726786AbeJMWzE (ORCPT ); Sat, 13 Oct 2018 18:55:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=qH0ObQVGjrg0B0IoShemPZdD1Bg3bhhM1MBPAOHrmKk=; b=dE9eewrgVO23IgOFJYj/l5kJ41 kYZzP6xjRTWELgufo7IVWkhZEsxrbsHKF0cP9Xy468o8aIJY0jv+UInaYcfDLEVxMg6LwOPGDwije 3D27m76Fux3yncb6tqkbQ0mkQle+n6OaxkTfqW99EuCqqEWCIh+vcP/3B+rrtBvxAzzadMScg94XV LTAFmyYPbMyp6bWDti3IKO081jJdDavGShlfMoip7QlWXC2INy+YswG/HSGv3aQWHjgUfrSwmuFzm WuFxe4UvmYZ8Rl5IftGbyBuyDxPsjDtAtqP3SFErd0eV9cML5tqIVveDOPfeV56lawDnpTTLWBNP0 Y10/NZOw==; Received: from 089144199123.atnat0008.highway.a1.net ([89.144.199.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gBLfX-00053t-Lx; Sat, 13 Oct 2018 15:17:32 +0000 From: Christoph Hellwig To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 8/8] fsl-diu-fb: don't pass GFP_DMA32 to dmam_alloc_coherent Date: Sat, 13 Oct 2018 17:17:07 +0200 Message-Id: <20181013151707.32210-9-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181013151707.32210-1-hch@lst.de> References: <20181013151707.32210-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The DMA API does its own zone decisions based on the coherent_dma_mask. Signed-off-by: Christoph Hellwig --- drivers/video/fbdev/fsl-diu-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c index bc9eb8afc313..6a49fe917bdb 100644 --- a/drivers/video/fbdev/fsl-diu-fb.c +++ b/drivers/video/fbdev/fsl-diu-fb.c @@ -1697,7 +1697,7 @@ static int fsl_diu_probe(struct platform_device *pdev) int ret; data = dmam_alloc_coherent(&pdev->dev, sizeof(struct fsl_diu_data), - &dma_addr, GFP_DMA | __GFP_ZERO); + &dma_addr, GFP_KERNEL | __GFP_ZERO); if (!data) return -ENOMEM; data->dma_addr = dma_addr;