diff --git a/projects/Allwinner/patches/linux/0002-backport-from-5.2.patch b/projects/Allwinner/patches/linux/0002-backport-from-5.2.patch index fc35510d93..cfeada910b 100644 --- a/projects/Allwinner/patches/linux/0002-backport-from-5.2.patch +++ b/projects/Allwinner/patches/linux/0002-backport-from-5.2.patch @@ -703,60 +703,6 @@ index bce0705df953..20c82fb0c343 100644 2.20.1 -From bb6b00e1225a5b382b723d3c2190429e15a4c607 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Mon, 28 Jan 2019 19:45:38 +0100 -Subject: [PATCH 2/6] media: cedrus: Add a quirk for not setting DMA offset - -H6 VPU doesn't work if DMA offset is set. - -Add a quirk for it. - -Signed-off-by: Jernej Skrabec ---- - 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 4aedd24a9848..c57c04b41d2e 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 0acf219a8c91..fbfff7c1c771 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 - - From 744c66f8c328ef40b6fb246f8b9f2daa9cce4d9d Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Mon, 28 Jan 2019 19:47:33 +0100