media: bdisp: 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/bdisp/bdisp-hw.c b/drivers/media/platform/sti/bdisp/bdisp-hw.c
index a5eb592e12c048c0ab5fb5b4bf30f86f0667ee36..26d9fa7aeb5f2d8b46167bca20ab06c6c0ad1914 100644 (file)
--- a/drivers/media/platform/sti/bdisp/bdisp-hw.c
+++ b/drivers/media/platform/sti/bdisp/bdisp-hw.c
@@ -455,7 +455,7 @@ int bdisp_hw_alloc_nodes(struct bdisp_ctx *ctx)
 
        /* Allocate all the nodes within a single memory page */
        base = dma_alloc_attrs(dev, node_size * MAX_NB_NODE, &paddr,
-                              GFP_KERNEL | GFP_DMA, DMA_ATTR_WRITE_COMBINE);
+                              GFP_KERNEL, DMA_ATTR_WRITE_COMBINE);
        if (!base) {
                dev_err(dev, "%s no mem\n", __func__);
                return -ENOMEM;

diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
index bf4ca16db44064b338468ce9a580a96d0b515aba..66b64096f5de0e8cc33306af98692d9b4e7b2691 100644 (file)
--- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
+++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
@@ -1297,6 +1297,10 @@ static int bdisp_probe(struct platform_device *pdev)
        if (!bdisp)
                return -ENOMEM;
 
+       ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
+       if (ret)
+               return ret;
+
        bdisp->pdev = pdev;
        bdisp->dev = dev;
        platform_set_drvdata(pdev, bdisp);