[PATCH 2/2] media: st-hva: don't use GFP_DMA

[Fabien Dessenne]

Set the DMA_MASK and stop using the GFP_DMA flag

Signed-off-by: Fabien Dessenne <fabien.desse...@st.com>
---
 drivers/media/platform/sti/hva/hva-mem.c  | 2 +-
 drivers/media/platform/sti/hva/hva-v4l2.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/sti/hva/hva-mem.c 
b/drivers/media/platform/sti/hva/hva-mem.c
index caf50cd..68047b6 100644
--- a/drivers/media/platform/sti/hva/hva-mem.c
+++ b/drivers/media/platform/sti/hva/hva-mem.c
@@ -22,7 +22,7 @@ int hva_mem_alloc(struct hva_ctx *ctx, u32 size, const char 
*name,
                return -ENOMEM;
        }
 
-       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) {
                dev_err(dev, "%s %s : dma_alloc_attrs failed for %s 
(size=%d)\n",
diff --git a/drivers/media/platform/sti/hva/hva-v4l2.c 
b/drivers/media/platform/sti/hva/hva-v4l2.c
index 2ab0b5c..15080cb 100644
--- a/drivers/media/platform/sti/hva/hva-v4l2.c
+++ b/drivers/media/platform/sti/hva/hva-v4l2.c
@@ -1355,6 +1355,10 @@ static int hva_probe(struct platform_device *pdev)
                goto err;
        }
 
+       ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
+       if (ret)
+               return ret;
+
        hva->dev = dev;
        hva->pdev = pdev;
        platform_set_drvdata(pdev, hva);
-- 
2.7.4