summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorFrancois Buergisser <fbuergisser@chromium.org>2019-07-25 10:17:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 15:12:20 +0200
commitfa829a21cfdd7b01b0ae739034b3d54e0c2a405b (patch)
tree9608715cbec29d2cd8c57fef012e1a08b1791d19 /drivers
parent29ed55517b8b7dc313ff402e085aead4766ba134 (diff)
downloadlinux-stable-fa829a21cfdd7b01b0ae739034b3d54e0c2a405b.tar.gz
linux-stable-fa829a21cfdd7b01b0ae739034b3d54e0c2a405b.tar.bz2
linux-stable-fa829a21cfdd7b01b0ae739034b3d54e0c2a405b.zip
media: hantro: Set DMA max segment size
commit c3c3509b86810293df5c524ef61421d8affc8bf0 upstream. The Hantro codec is typically used in platforms with an IOMMU, so we need to set a proper DMA segment size. Devices without an IOMMU will still fallback to default 64KiB segments. Cc: stable@vger.kernel.org Fixes: 775fec69008d3 ("media: add Rockchip VPU JPEG encoder driver") Signed-off-by: Francois Buergisser <fbuergisser@chromium.org> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/media/hantro/hantro_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index c3665f0e87a2..46dcb46bb927 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -724,6 +724,7 @@ static int hantro_probe(struct platform_device *pdev)
dev_err(vpu->dev, "Could not set DMA coherent mask.\n");
return ret;
}
+ vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
for (i = 0; i < vpu->variant->num_irqs; i++) {
const char *irq_name = vpu->variant->irqs[i].name;