diff options
| author | Fabien Dessenne <fabien.dessenne@st.com> | 2018-05-15 10:37:06 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-05-25 22:35:19 +0300 |
| commit | 2732bb765f14ebc87d1066c4703423743dfe91b0 (patch) | |
| tree | f53091c9afd73c1dc4f36b16109d65168c8f912f /drivers/media/platform/sti | |
| parent | 6aecad62670bb728d9616c672114d1627f877f33 (diff) | |
| download | linux-2732bb765f14ebc87d1066c4703423743dfe91b0.tar.xz | |
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>
Diffstat (limited to 'drivers/media/platform/sti')
| -rw-r--r-- | drivers/media/platform/sti/bdisp/bdisp-hw.c | 2 | ||||
| -rw-r--r-- | drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/sti/bdisp/bdisp-hw.c b/drivers/media/platform/sti/bdisp/bdisp-hw.c index a5eb592e12c0..26d9fa7aeb5f 100644 --- 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 bf4ca16db440..66b64096f5de 100644 --- 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); |