linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: John Crispin <john@phrozen.org>, Vinod Koul <vkoul@kernel.org>,
	Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no>,
	Nicolas Ferre <nicolas.ferre@microchip.com>,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
	Felipe Balbi <balbi@kernel.org>,
	linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
	dmaengine@vger.kernel.org, netdev@vger.kernel.org,
	linux-usb@vger.kernel.org, linux-fbdev@vger.kernel.org,
	alsa-devel@alsa-project.org
Cc: iommu@lists.linux-foundation.org
Subject: [PATCH 15/18] gbefb: switch to managed version of the DMA allocator
Date: Fri,  1 Feb 2019 09:47:58 +0100	[thread overview]
Message-ID: <20190201084801.10983-16-hch@lst.de> (raw)
In-Reply-To: <20190201084801.10983-1-hch@lst.de>

gbefb uses managed resources, so it should do the same for DMA
allocations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/video/fbdev/gbefb.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/drivers/video/fbdev/gbefb.c b/drivers/video/fbdev/gbefb.c
index 1a242b1338e9..3fcb33232ba3 100644
--- a/drivers/video/fbdev/gbefb.c
+++ b/drivers/video/fbdev/gbefb.c
@@ -1162,9 +1162,9 @@ static int gbefb_probe(struct platform_device *p_dev)
 	}
 	gbe_revision = gbe->ctrlstat & 15;
 
-	gbe_tiles.cpu =
-		dma_alloc_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
-				   &gbe_tiles.dma, GFP_KERNEL);
+	gbe_tiles.cpu = dmam_alloc_coherent(&p_dev->dev,
+				GBE_TLB_SIZE * sizeof(uint16_t),
+				&gbe_tiles.dma, GFP_KERNEL);
 	if (!gbe_tiles.cpu) {
 		printk(KERN_ERR "gbefb: couldn't allocate tiles table\n");
 		ret = -ENOMEM;
@@ -1178,19 +1178,20 @@ static int gbefb_probe(struct platform_device *p_dev)
 		if (!gbe_mem) {
 			printk(KERN_ERR "gbefb: couldn't map framebuffer\n");
 			ret = -ENOMEM;
-			goto out_tiles_free;
+			goto out_release_mem_region;
 		}
 
 		gbe_dma_addr = 0;
 	} else {
 		/* try to allocate memory with the classical allocator
 		 * this has high chance to fail on low memory machines */
-		gbe_mem = dma_alloc_wc(NULL, gbe_mem_size, &gbe_dma_addr,
-				       GFP_KERNEL);
+		gbe_mem = dmam_alloc_attrs(&p_dev->dev, gbe_mem_size,
+				&gbe_dma_addr, GFP_KERNEL,
+				DMA_ATTR_WRITE_COMBINE);
 		if (!gbe_mem) {
 			printk(KERN_ERR "gbefb: couldn't allocate framebuffer memory\n");
 			ret = -ENOMEM;
-			goto out_tiles_free;
+			goto out_release_mem_region;
 		}
 
 		gbe_mem_phys = (unsigned long) gbe_dma_addr;
@@ -1237,11 +1238,6 @@ static int gbefb_probe(struct platform_device *p_dev)
 
 out_gbe_unmap:
 	arch_phys_wc_del(par->wc_cookie);
-	if (gbe_dma_addr)
-		dma_free_wc(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
-out_tiles_free:
-	dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
-			  (void *)gbe_tiles.cpu, gbe_tiles.dma);
 out_release_mem_region:
 	release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
 out_release_framebuffer:
@@ -1258,10 +1254,6 @@ static int gbefb_remove(struct platform_device* p_dev)
 	unregister_framebuffer(info);
 	gbe_turn_off();
 	arch_phys_wc_del(par->wc_cookie);
-	if (gbe_dma_addr)
-		dma_free_wc(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
-	dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),
-			  (void *)gbe_tiles.cpu, gbe_tiles.dma);
 	release_mem_region(GBE_BASE, sizeof(struct sgi_gbe));
 	gbefb_remove_sysfs(&p_dev->dev);
 	framebuffer_release(info);
-- 
2.20.1


  parent reply	other threads:[~2019-02-01  8:49 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-01  8:47 don't pass a NULL struct device to DMA API functions Christoph Hellwig
2019-02-01  8:47 ` [PATCH 01/18] MIPS: lantiq: pass " Christoph Hellwig
2019-02-07 23:29   ` Paul Burton
2019-02-12  7:45     ` Christoph Hellwig
2019-02-12 17:41   ` Paul Burton
2019-02-01  8:47 ` [PATCH 02/18] dmaengine: imx-sdma: " Christoph Hellwig
2019-02-02 10:11   ` Vinod Koul
2019-02-02 17:21     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 03/18] net: caif: " Christoph Hellwig
2019-02-01 13:53   ` Robin Murphy
2019-02-01 16:10     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 04/18] au1000_eth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 05/18] macb_main: " Christoph Hellwig
2019-02-01 13:34   ` Nicolas.Ferre
2019-02-01  8:47 ` [PATCH 06/18] lantiq_etop: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 07/18] pxa168_eth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 08/18] moxart_ether: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 09/18] meth: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 10/18] smc911x: " Christoph Hellwig
2019-02-01 14:14   ` Robin Murphy
2019-02-01 16:11     ` Christoph Hellwig
2019-02-01  8:47 ` [PATCH 11/18] parport_ip32: " Christoph Hellwig
2019-02-01  8:47 ` [PATCH 12/18] fotg210-udc: remove a bogus dma_sync_single_for_device call Christoph Hellwig
2019-02-01 13:19   ` Felipe Balbi
2019-02-01 16:10     ` Christoph Hellwig
2019-02-11 13:12       ` Christoph Hellwig
2019-02-11 13:30         ` Felipe Balbi
2019-02-01  8:47 ` [PATCH 13/18] fotg210-udc: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:20   ` Felipe Balbi
2019-02-01  8:47 ` [PATCH 14/18] da8xx-fb: " Christoph Hellwig
2019-02-01  8:47 ` Christoph Hellwig [this message]
2019-02-01  8:47 ` [PATCH 16/18] pxa3xx-gcu: pass struct device to dma_mmap_coherent Christoph Hellwig
2019-02-01  8:48 ` [PATCH 17/18] ALSA: hal2: pass struct device to DMA API functions Christoph Hellwig
2019-02-01 13:12   ` [alsa-devel] " Takashi Iwai
2019-02-01 16:09     ` Christoph Hellwig
2019-02-01 16:17       ` Takashi Iwai
2019-02-01  8:48 ` [PATCH 18/18] ALSA: " Christoph Hellwig
2019-02-01 13:13   ` [alsa-devel] " Takashi Iwai
2019-02-01 13:16 ` [alsa-devel] don't pass a NULL " Takashi Iwai
2019-02-01 16:09   ` Christoph Hellwig
2019-02-01 16:18     ` Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190201084801.10983-16-hch@lst.de \
    --to=hch@lst.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=balbi@kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=dmitry.tarnyagin@lockless.no \
    --cc=iommu@lists.linux-foundation.org \
    --cc=john@phrozen.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=sudipm.mukherjee@gmail.com \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).