Hi Guennadi, On 20 February 2012 13:17, Guennadi Liakhovetski <g.liakhovet...@gmx.de> wrote: >> @@ -1302,21 +1305,12 @@ static irqreturn_t mx27_camera_emma_irq(int >> irq_emma, void *data) >> __func__); >> >> if (status & (1 << 7)) { /* overflow */ >> - u32 cntl; >> - /* >> - * We only disable channel 1 here since this is the only >> - * enabled channel >> - * >> - * FIXME: the correct DMA overflow handling should be resetting >> - * the buffer, returning an error frame, and continuing with >> - * the next one. >> - */ >> - cntl = readl(pcdev->base_emma + PRP_CNTL); >> - writel(cntl & ~(PRP_CNTL_CH1EN | PRP_CNTL_CH2EN), >> - pcdev->base_emma + PRP_CNTL); >> - writel(cntl, pcdev->base_emma + PRP_CNTL); >> - } >> - if (((status & (3 << 5)) == (3 << 5)) || >> + buf = list_entry(pcdev->active_bufs.next, >> + struct mx2_buffer, queue); >> + mx27_camera_frame_done_emma(pcdev, >> + buf->bufnum, true); >> + status &= ~(1 << 7); >> + } else if (((status & (3 << 5)) == (3 << 5)) || > > This means, in case of an overflow you don't reset the channels any more? > Is there a reason for that?
Apparently, while I added the "returning an error frame, and continue with the next one" part I accidentally removed the "resetting the buffer" part. Let me send a v4 version of this patch. I hope to have it ready for tomorrow. -- Javier Martin Vista Silicon S.L. CDTUC - FASE C - Oficina S-345 Avda de los Castros s/n 39005- Santander. Cantabria. Spain +34 942 25 32 60 www.vista-silicon.com -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html