Commit a1029f55 authored by Hugues Fruchet's avatar Hugues Fruchet Committed by Mauro Carvalho Chehab

media: stm32-dcmi: rework overrun/error case

Do not stop/restart dma on overrun or errors.
Dma will be restarted on current frame transfer
completion. Frame transfer completion is ensured
even if overrun or error occurs by DCMI continuous
capture mode which restarts data transfer at next
frame sync.
Do no warn on overrun while in irq thread, this slows down
system and lead to more overrun errors. Use a counter
instead and log errors at stop streaming.
Signed-off-by: default avatarHugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f8c5363d
...@@ -160,6 +160,7 @@ struct stm32_dcmi { ...@@ -160,6 +160,7 @@ struct stm32_dcmi {
dma_cookie_t dma_cookie; dma_cookie_t dma_cookie;
u32 misr; u32 misr;
int errors_count; int errors_count;
int overrun_count;
int buffers_count; int buffers_count;
}; };
...@@ -373,23 +374,9 @@ static irqreturn_t dcmi_irq_thread(int irq, void *arg) ...@@ -373,23 +374,9 @@ static irqreturn_t dcmi_irq_thread(int irq, void *arg)
} }
if ((dcmi->misr & IT_OVR) || (dcmi->misr & IT_ERR)) { if ((dcmi->misr & IT_OVR) || (dcmi->misr & IT_ERR)) {
/*
* An overflow or an error has been detected,
* stop current DMA transfert & restart it
*/
dev_warn(dcmi->dev, "%s: Overflow or error detected\n",
__func__);
dcmi->errors_count++; dcmi->errors_count++;
dev_dbg(dcmi->dev, "Restarting capture after DCMI error\n"); if (dcmi->misr & IT_OVR)
dcmi->overrun_count++;
spin_unlock_irq(&dcmi->irqlock);
dmaengine_terminate_all(dcmi->dma_chan);
if (dcmi_start_capture(dcmi))
dev_err(dcmi->dev, "%s: Cannot restart capture on overflow or error\n",
__func__);
return IRQ_HANDLED;
} }
spin_unlock_irq(&dcmi->irqlock); spin_unlock_irq(&dcmi->irqlock);
...@@ -572,6 +559,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -572,6 +559,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)
dcmi->sequence = 0; dcmi->sequence = 0;
dcmi->errors_count = 0; dcmi->errors_count = 0;
dcmi->overrun_count = 0;
dcmi->buffers_count = 0; dcmi->buffers_count = 0;
dcmi->active = NULL; dcmi->active = NULL;
...@@ -682,8 +670,13 @@ static void dcmi_stop_streaming(struct vb2_queue *vq) ...@@ -682,8 +670,13 @@ static void dcmi_stop_streaming(struct vb2_queue *vq)
clk_disable(dcmi->mclk); clk_disable(dcmi->mclk);
dev_dbg(dcmi->dev, "Stop streaming, errors=%d buffers=%d\n", if (dcmi->errors_count)
dcmi->errors_count, dcmi->buffers_count); dev_warn(dcmi->dev, "Some errors found while streaming: errors=%d (overrun=%d), buffers=%d\n",
dcmi->errors_count, dcmi->overrun_count,
dcmi->buffers_count);
dev_dbg(dcmi->dev, "Stop streaming, errors=%d (overrun=%d), buffers=%d\n",
dcmi->errors_count, dcmi->overrun_count,
dcmi->buffers_count);
} }
static const struct vb2_ops dcmi_video_qops = { static const struct vb2_ops dcmi_video_qops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment