media: cedrus: Add a quirk for not setting DMA offset

[ Upstream commit 70a4f5cda82f7197c350099b66fd23506620810e ]

H6 VPU doesn't work if DMA offset is set.

Add a quirk for it.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index 3acfdcf8369128735f0489945389244227bca138..726bef649ba6ee2ba89993128e06561f75fab22d 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -28,6 +28,8 @@
 
 #define CEDRUS_CAPABILITY_UNTILED      BIT(0)
 
+#define CEDRUS_QUIRK_NO_DMA_OFFSET     BIT(0)
+
 enum cedrus_codec {
        CEDRUS_CODEC_MPEG2,
 
@@ -91,6 +93,7 @@ struct cedrus_dec_ops {
 
 struct cedrus_variant {
        unsigned int    capabilities;
+       unsigned int    quirks;
 };
 
 struct cedrus_dev {

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index 300339fee1bc67bd5abf896e44c59e3e9312eacd..24a06a1260f0a142d10ac9d4aa75fed1069b1452 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -177,7 +177,8 @@ int cedrus_hw_probe(struct cedrus_dev *dev)
         */
 
 #ifdef PHYS_PFN_OFFSET
-       dev->dev->dma_pfn_offset = PHYS_PFN_OFFSET;
+       if (!(variant->quirks & CEDRUS_QUIRK_NO_DMA_OFFSET))
+               dev->dev->dma_pfn_offset = PHYS_PFN_OFFSET;
 #endif
 
        ret = of_reserved_mem_device_init(dev->dev);