| From d44e90675642a19092c49767881a1b01c0e5eeb6 Mon Sep 17 00:00:00 2001 |
| From: Jernej Skrabec <jernej.skrabec@siol.net> |
| Date: Mon, 28 Jan 2019 15:55:00 -0500 |
| Subject: 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> |
| --- |
| drivers/staging/media/sunxi/cedrus/cedrus.h | 3 +++ |
| drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 ++- |
| 2 files changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h |
| index 4aedd24a98480..c57c04b41d2e8 100644 |
| --- 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 0acf219a8c918..fbfff7c1c771f 100644 |
| --- 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); |
| -- |
| 2.20.1 |
| |