Re: [PATCH 2/2] media: verisilicon: Reset the VDPU2 decoder after an error

From: Nicolas Dufresne

Date: Thu Nov 19 2026 - 10:30:29 EST


Le jeudi 19 novembre 2026 à 06:20 +0000, Arun Iyengar via B4 Relay a écrit :
> From: Arun Iyengar <aiyengar1990@xxxxxxxxx>
>
> 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.

Its not because the vendor use a big hammer that we should use it upstream. We
fixed a lot of these driver bugs by handling specific error correctly. When the
TRM says the IP will self reset, it does, and you should not add extra overhead
there unless you can prove something is broken.

Please check G2 IRQ handler, its more aligned to were we want to bring all the
IRQ handlers in this driver.

Nicolas

>
> Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
> ---
> .../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)

Attachment: signature.asc
Description: This is a digitally signed message part