media: st-hva: don't use GFP_DMA

Set the DMA_MASK and stop using the GFP_DMA flag

Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/sti/hva/hva-mem.c b/drivers/media/platform/sti/hva/hva-mem.c
index caf50cd4bb77bba1bab74a75856e5aca72f37279..68047b60b66cf646a6ab2fdae117d592061dae19 100644 (file)
--- 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 2ab0b5cc5c22c8bf834b3ab5bce0e250cfb77f4f..15080cb00fa7ed21215769557b3bf425ec1dac26 100644 (file)
--- 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);