Message ID | 20181013151707.32210-7-hch@lst.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1gBLfm-000230-Nb; Sat, 13 Oct 2018 15:17:47 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727271AbeJMWy7 (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); 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 <rfc822;linux-media@vger.kernel.org>); 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 <hch@lst.de> 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 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Christoph Hellwig
Oct. 13, 2018, 3:17 p.m. UTC
The DMA API does its own zone decisions based on the coherent_dma_mask.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/gpu/drm/sti/sti_gdp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Le sam. 13 oct. 2018 à 17:17, Christoph Hellwig <hch@lst.de> a écrit : > > The DMA API does its own zone decisions based on the coherent_dma_mask. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > --- > 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"); > -- > 2.19.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Le lun. 15 oct. 2018 à 11:12, Benjamin Gaignard <benjamin.gaignard@linaro.org> a écrit : > > Le sam. 13 oct. 2018 à 17:17, Christoph Hellwig <hch@lst.de> a écrit : > > > > The DMA API does its own zone decisions based on the coherent_dma_mask. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Christoph do you plan to merge this patch on your own tree ? or would like I put it directly in drm-misc-next branch ? Regards, Benjamin > > > --- > > 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"); > > -- > > 2.19.1 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > -- > Benjamin Gaignard > > Graphic Study Group > > Linaro.org ? Open source software for ARM SoCs > > Follow Linaro: Facebook | Twitter | Blog
On Tue, Oct 16, 2018 at 02:41:23PM +0200, Benjamin Gaignard wrote: > Le lun. 15 oct. 2018 à 11:12, Benjamin Gaignard > <benjamin.gaignard@linaro.org> a écrit : > > > > Le sam. 13 oct. 2018 à 17:17, Christoph Hellwig <hch@lst.de> a écrit : > > > > > > The DMA API does its own zone decisions based on the coherent_dma_mask. > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > > Christoph do you plan to merge this patch on your own tree ? or would > like I put it directly in drm-misc-next branch ? Please pull it in through drm-misc-next, thanks!
Le mer. 17 oct. 2018 à 09:19, Christoph Hellwig <hch@lst.de> a écrit : > > On Tue, Oct 16, 2018 at 02:41:23PM +0200, Benjamin Gaignard wrote: > > Le lun. 15 oct. 2018 à 11:12, Benjamin Gaignard > > <benjamin.gaignard@linaro.org> a écrit : > > > > > > Le sam. 13 oct. 2018 à 17:17, Christoph Hellwig <hch@lst.de> a écrit : > > > > > > > > The DMA API does its own zone decisions based on the coherent_dma_mask. > > > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > > > Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> > > > > Christoph do you plan to merge this patch on your own tree ? or would > > like I put it directly in drm-misc-next branch ? > > Please pull it in through drm-misc-next, thanks! Applied on drm-misc-next, Thanks, Benjamin
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");