From: Arun Iyengar via B4 Relay <devnull+aiyengar1990.gmail.com@kernel.org>
To: Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Benjamin Gaignard <benjamin.gaignard@collabora.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
Jonas Karlman <jonas@kwiboo.se>,
Boris Brezillon <boris.brezillon@collabora.com>,
Hans Verkuil <hverkuil@kernel.org>
Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Arun Iyengar <aiyengar1990@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error
Date: Thu, 19 Nov 2026 06:20:08 +0000 [thread overview]
Message-ID: <20261119-vdpu2-errreset-v1-2-f8fa403b6a3a@gmail.com> (raw)
In-Reply-To: <20261119-vdpu2-errreset-v1-0-f8fa403b6a3a@gmail.com>
From: Arun Iyengar <aiyengar1990@gmail.com>
After a stream or bus error the decoder can still access the buffers of
the failed picture. On RK3588 these accesses hit buffers userspace had
already freed: IOMMU page faults, an IOMMU that can no longer stall and
corrupted output for the next job.
Soft-reset the decoder on every error interrupt, as the vendor driver
does, and wait for the reset to complete.
Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399")
Cc: stable@vger.kernel.org
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
.../media/platform/verisilicon/rockchip_vpu_hw.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
index 4bc1bdb41c70..01cd449f3ab2 100644
--- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -7,6 +7,7 @@
*/
#include <linux/clk.h>
+#include <linux/iopoll.h>
#include "hantro.h"
#include "hantro_jpeg.h"
@@ -384,6 +385,21 @@ static irqreturn_t rockchip_vpu1_vepu_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
+/*
+ * After an error the decoder can still have bus accesses of the failed
+ * picture in flight; reset it before its buffers go back to userspace.
+ */
+static void rockchip_vpu2_dec_soft_reset(struct hantro_dev *vpu)
+{
+ u32 val;
+
+ vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS);
+ vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET);
+ if (read_poll_timeout_atomic(vdpu_read, val, !val, 0, 5, false, vpu,
+ VDPU_REG_SOFT_RESET))
+ dev_warn_ratelimited(vpu->dev, "decoder soft reset timed out\n");
+}
+
static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id)
{
struct hantro_dev *vpu = dev_id;
@@ -396,6 +412,8 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id)
vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL);
+ if (state != VB2_BUF_STATE_DONE)
+ rockchip_vpu2_dec_soft_reset(vpu);
hantro_irq_done(vpu, state);
@@ -482,8 +500,7 @@ static void rockchip_vpu2_dec_reset(struct hantro_ctx *ctx)
struct hantro_dev *vpu = ctx->dev;
vdpu_write(vpu, VDPU_REG_INTERRUPT_DEC_IRQ_DIS, VDPU_REG_INTERRUPT);
- vdpu_write(vpu, 0, VDPU_REG_EN_FLAGS);
- vdpu_write(vpu, 1, VDPU_REG_SOFT_RESET);
+ rockchip_vpu2_dec_soft_reset(vpu);
}
static void rockchip_vpu2_enc_reset(struct hantro_ctx *ctx)
--
2.55.0
prev parent reply other threads:[~2026-11-19 6:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 6:20 [PATCH 0/2] media: verisilicon: Fix VDPU2 decoder error handling Arun Iyengar via B4 Relay
2026-11-19 6:20 ` [PATCH 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay
2026-11-19 6:20 ` Arun Iyengar via B4 Relay [this message]
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=20261119-vdpu2-errreset-v1-2-f8fa403b6a3a@gmail.com \
--to=devnull+aiyengar1990.gmail.com@kernel.org \
--cc=aiyengar1990@gmail.com \
--cc=benjamin.gaignard@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=heiko@sntech.de \
--cc=hverkuil@kernel.org \
--cc=jonas@kwiboo.se \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--cc=stable@vger.kernel.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
all inboxes | Powered by JetHome®