media: verisilicon: Fix VDPU2 decoder error handling
Subsystems (4)
v2 cover media: verisilicon: Fix VDPU2 decoder error handling
The VDPU2 decoder reports failed decodes as done, and its interrupt handler can finish a job the decoder is still working on.
Tested on Orange Pi 5 (RK3588S), v7.3-based KASAN kernel: 72 H.264 fluster suite runs, 50 error-stream runs, VP8 61/61; no IOMMU faults or timeouts. The decoder was still enabled after 72 buffer-empty interrupts; a later interrupt ended each of those jobs.
With a TEST-only patch (not in this series), the IRQ_NONE path ran 200 times on real registers; bus error and timeout, simulated 5 times each by injected status bits, were logged and ended their jobs at once. VP8 stayed 61/61 bit-exact.
Build-tested on media next. MPEG-2, RK3399 and RK3568 untested.
Developed with Claude (Anthropic), which wrote the code and the commit messages. I reviewed every change.
---
Changes in v2:
- Patch 2: no reset after an error; handle the interrupt like the G2 handler instead (Nicolas)
- Link to v1: https://patch.msgid.link/[email protected]
---
Arun Iyengar (2):
media: verisilicon: Don't report VDPU2 decoder errors as success
media: verisilicon: Handle VDPU2 decoder interrupts like the G2
drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
---
base-commit: aa0f4c41d4870a18e65772a1817af16427200371
change-id: 20261115-vdpu2-errreset-8688700393a3
Best regards,
Signature · 1 line
Arun Iyengar <[email protected]>
PATCH v2 1/2 media: verisilicon: Don't report VDPU2 decoder errors as success
The VDPU2 interrupt handler completes the job as done whenever the decoder raised an interrupt. DEC_IRQ is set for every interrupt, including timeouts, bus errors and stream errors, so failed decodes are returned to userspace as valid frames.
Check the picture ready bit instead, as the G1 handler does.
--- drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/verisilicon/rockchip_vpu_hw.c +1 -1
@@ -391,7 +391,7 @@ static irqreturn_t rockchip_vpu2_vdpu_irq(int irq, void *dev_id)u32 status; status =vdpu_read (vpu,VDPU_REG_INTERRUPT ); - state = (status &VDPU_REG_INTERRUPT_DEC_IRQ ) ? + state = (status &VDPU_REG_INTERRUPT_DEC_RDY_INT ) ?VB2_BUF_STATE_DONE :VB2_BUF_STATE_ERROR ;vdpu_write (vpu,0 ,VDPU_REG_INTERRUPT );
Signature · 1 line
2.55.0
PATCH v2 2/2 media: verisilicon: Handle VDPU2 decoder interrupts like the G2
In reply to Arun IyengarDo 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.
--- drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/media/platform/verisilicon/rockchip_vpu_hw.c +17 -1
@@ -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);
Signature · 1 line
2.55.0