* [PATCH v2 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success
[not found] <20261120-vdpu2-errreset-v2-0-8f4ef55e6dee@gmail.com>
@ 2026-11-20 2:49 ` Arun Iyengar via B4 Relay
2026-11-20 2:49 ` [PATCH v2 2/2] media: verisilicon: Handle VDPU2 decoder interrupts like the G2 Arun Iyengar via B4 Relay
1 sibling, 0 replies; 2+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-20 2:49 UTC (permalink / raw)
To: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel,
Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman,
Boris Brezillon, Hans Verkuil
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Arun Iyengar, stable
From: Arun Iyengar <aiyengar1990@gmail.com>
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.
Fixes: 879dee56a40c ("media: rockchip/vpu: Add MPEG2 decoding support to RK3399")
Cc: stable@vger.kernel.org
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
drivers/media/platform/verisilicon/rockchip_vpu_hw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
index 02673be9878e..4bc1bdb41c70 100644
--- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -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);
--
2.55.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] media: verisilicon: Handle VDPU2 decoder interrupts like the G2
[not found] <20261120-vdpu2-errreset-v2-0-8f4ef55e6dee@gmail.com>
2026-11-20 2:49 ` [PATCH v2 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay
@ 2026-11-20 2:49 ` Arun Iyengar via B4 Relay
1 sibling, 0 replies; 2+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-20 2:49 UTC (permalink / raw)
To: Nicolas Dufresne, Benjamin Gaignard, Philipp Zabel,
Mauro Carvalho Chehab, Heiko Stuebner, Jonas Karlman,
Boris Brezillon, Hans Verkuil
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
Arun Iyengar
From: Arun Iyengar <aiyengar1990@gmail.com>
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@gmail.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-20 2:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20261120-vdpu2-errreset-v2-0-8f4ef55e6dee@gmail.com>
2026-11-20 2:49 ` [PATCH v2 1/2] media: verisilicon: Don't report VDPU2 decoder errors as success Arun Iyengar via B4 Relay
2026-11-20 2:49 ` [PATCH v2 2/2] media: verisilicon: Handle VDPU2 decoder interrupts like the G2 Arun Iyengar via B4 Relay
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®