]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] media: ti-vpe: vpe: Post next descriptor only for list complete IRQ
authorNikhil Devshatwar <nikhil.nd@ti.com>
Fri, 18 Nov 2016 23:20:27 +0000 (21:20 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 22 Nov 2016 10:00:30 +0000 (08:00 -0200)
vpe_irq checks for the possible interrupt sources and prints the
errors for the DEI_ERROR and DS_UV interrupts. But it also post the
next descriptor list irrespective of whichever interrupt has occurred.

Because of this, driver may release the buffers even before DMA is
complete and also schedule next descriptor list.

Fix this by _actually_ handling the IRQ only when ListComplete IRQ
occurs.

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/ti-vpe/vpe.c

index 1ee7e611e41b0bd9822aef18d9c6a1d8d20a49bb..0f652a049edefdeba528b02979df9a0dc021f3dd 100644 (file)
@@ -1304,6 +1304,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
        struct vb2_v4l2_buffer *s_vb, *d_vb;
        unsigned long flags;
        u32 irqst0, irqst1;
+       bool list_complete = false;
 
        irqst0 = read_reg(dev, VPE_INT0_STATUS0);
        if (irqst0) {
@@ -1339,6 +1340,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
                        vpdma_clear_list_stat(ctx->dev->vpdma, 0, 0);
 
                irqst0 &= ~(VPE_INT0_LIST0_COMPLETE);
+               list_complete = true;
        }
 
        if (irqst0 | irqst1) {
@@ -1346,6 +1348,13 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
                        irqst0, irqst1);
        }
 
+       /*
+        * Setup next operation only when list complete IRQ occurs
+        * otherwise, skip the following code
+        */
+       if (!list_complete)
+               goto handled;
+
        disable_irqs(ctx);
 
        vpdma_unmap_desc_buf(dev->vpdma, &ctx->desc_list.buf);