From: Jernej Skrabec <jernej.skrabec@siol.net>
To: maxime.ripard@bootlin.com, wens@csie.org
Cc: mchehab@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com,
linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH 2/6] media: cedrus: Add a quirk for not setting DMA offset
Date: Mon, 28 Jan 2019 21:55:00 +0100 [thread overview]
Message-ID: <20190128205504.11225-3-jernej.skrabec@siol.net> (raw)
In-Reply-To: <20190128205504.11225-1-jernej.skrabec@siol.net>
H6 VPU doesn't work if DMA offset is set.
Add a quirk for it.
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
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
next prev parent reply other threads:[~2019-01-28 20:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 20:54 [PATCH 0/6] H6 Cedrus support Jernej Skrabec
2019-01-28 20:54 ` [PATCH 1/6] dt-bindings: media: cedrus: Add H6 compatible Jernej Skrabec
2019-01-29 9:07 ` Maxime Ripard
2019-02-25 14:27 ` Rob Herring
2019-01-28 20:55 ` Jernej Skrabec [this message]
2019-01-29 9:07 ` [PATCH 2/6] media: cedrus: Add a quirk for not setting DMA offset Maxime Ripard
2019-01-28 20:55 ` [PATCH 3/6] media: cedrus: Add support for H6 Jernej Skrabec
2019-01-29 9:08 ` Maxime Ripard
2019-01-28 20:55 ` [PATCH 4/6] dt-bindings: sram: sunxi: Add compatible for the H6 SRAM C1 Jernej Skrabec
2019-01-29 9:08 ` Maxime Ripard
2019-01-28 20:55 ` [PATCH 5/6] arm64: dts: allwinner: h6: Add support for the SRAM C1 section Jernej Skrabec
2019-01-29 9:08 ` Maxime Ripard
2019-01-28 20:55 ` [PATCH 6/6] arm64: dts: allwinner: h6: Add Video Engine node Jernej Skrabec
2019-03-19 8:50 ` [linux-sunxi] " Paul Kocialkowski
2019-03-19 9:49 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190128205504.11225-3-jernej.skrabec@siol.net \
--to=jernej.skrabec@siol.net \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).