[6/8] drm: sti: don't pass GFP_DMA32 to dma_alloc_wc

Message ID 20181013151707.32210-7-hch@lst.de
State New
Headers show
Series
  • [1/8] cpufreq: tegra186: don't pass GFP_DMA32 to dma_alloc_coherent
Related show

Commit Message

Christoph Hellwig Oct. 13, 2018, 3:17 p.m.
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

Benjamin Gaignard Oct. 15, 2018, 9:12 a.m. | #1
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
Benjamin Gaignard Oct. 16, 2018, 12:41 p.m. | #2
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
Christoph Hellwig Oct. 17, 2018, 7:19 a.m. | #3
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!
Benjamin Gaignard Oct. 18, 2018, 11:59 a.m. | #4
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

Patch

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");