leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: st-hva: don't use GFP_DMA

Browse Source 
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>
This commit is contained in:
Fabien Dessenne 2018-05-15 03:37:07 -04:00 committed by Mauro Carvalho Chehab
parent 2732bb765f
commit 72c7caa486
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/sti/hva/hva-mem.c
View File

@ -22,7 +22,7 @@ int hva_mem_alloc(struct hva_ctx *ctx, u32 size, const char *name,
return -ENOMEM; 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); DMA_ATTR_WRITE_COMBINE);
if (!base) { if (!base) {
dev_err(dev, "%s %s : dma_alloc_attrs failed for %s (size=%d)\n", dev_err(dev, "%s %s : dma_alloc_attrs failed for %s (size=%d)\n",

4
drivers/media/platform/sti/hva/hva-v4l2.c
View File

@ -1355,6 +1355,10 @@ static int hva_probe(struct platform_device *pdev)
goto err; goto err;
} }
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
return ret;
hva->dev = dev; hva->dev = dev;
hva->pdev = pdev; hva->pdev = pdev;
platform_set_drvdata(pdev, hva); platform_set_drvdata(pdev, hva);