[PATCH v2 2/2] media: verisilicon: Handle VDPU2 decoder interrupts like the G2

From: Arun Iyengar via B4 Relay

Date: Thu Nov 19 2026 - 21:49:34 EST


From: Arun Iyengar <aiyengar1990@xxxxxxxxx>

Do as the G2 interrupt handler: ignore interrupts the decoder did not
raise, report the error type and don't finish the job while the decoder
is still enabled. The decoder disables itself on errors, except when
its input buffer runs empty; a later interrupt or the driver's
watchdog then ends the job.

Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
---
drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
index 4bc1bdb41c70..d20f295b43de 100644
--- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -391,10 +391,26 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id)
u32 status;

status = vdpu_read(vpu, VDPU_REG_INTERRUPT);
+ if (!(status & VDPU_REG_INTERRUPT_DEC_IRQ))
+ return IRQ_NONE;
+
+ vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
+
state = (status & VDPU_REG_INTERRUPT_DEC_RDY_INT) ?
VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR;
+ if (state == VB2_BUF_STATE_ERROR) {
+ if (status & VDPU_REG_INTERRUPT_DEC_BUS_INT)
+ dev_warn_ratelimited(vpu->dev, "bus error detected.\n");
+ if (status & VDPU_REG_INTERRUPT_DEC_ERROR_INT)
+ dev_warn_ratelimited(vpu->dev, "decode error detected.\n");
+ if (status & VDPU_REG_INTERRUPT_DEC_TIMEOUT)
+ dev_warn_ratelimited(vpu->dev, "frame decode timed out.\n");
+
+ /* Still enabled: a later interrupt or the watchdog ends the job. */
+ if (vdpu_read(vpu, VDPU_REG_EN_FLAGS) & VDPU_REG_INTERRUPT_DEC_E)
+ return IRQ_HANDLED;
+ }

- vdpu_write(vpu, 0, VDPU_REG_INTERRUPT);
vdpu_write(vpu, 0, VDPU_REG_AXI_CTRL);

hantro_irq_done(vpu, state);

--
2.55.0