From: Corentin Labbe <clabbe@baylibre.com>
Date: Fri, 25 Sep 2020 18:30:48 +0000 (+0200)
Subject: media: zoran: device support only 32bit DMA address
X-Git-Tag: v5.10-rc1~175^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4ae3689226e56014320e7bcd0298f7e49cfdd8f;p=thirdparty%2Fkernel%2Flinux.git

media: zoran: device support only 32bit DMA address

The zoran device only supports 32bit DMA address.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---

diff --git a/drivers/staging/media/zoran/zoran_card.c b/drivers/staging/media/zoran/zoran_card.c
index dbdb1c4b05158..0a193283eefc5 100644
--- a/drivers/staging/media/zoran/zoran_card.c
+++ b/drivers/staging/media/zoran/zoran_card.c
@@ -1111,6 +1111,12 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	int card_num;
 	const char *codec_name, *vfe_name;
 	unsigned int nr;
+	int err;
+
+	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+	if (err)
+		return -ENODEV;
+	vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
 
 	nr = zoran_num++;
 	if (nr >= BUZ_MAX) {