| Message ID | 1497287605-20074-7-git-send-email-thierry.escande@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Thierry, Thank you for the patch. Please see inline. W dniu 12.06.2017 o 19:13, Thierry Escande pisze: > From: henryhsu <henryhsu@chromium.org> > > On Exynos5420, the STREAM_STAT bit raised on the JPGINTST register means > there is a syntax error or an unrecoverable error on compressed file > when ERR_INT_EN is set to 1. > > Fix this case and report BUF_STATE_ERROR to videobuf2. > > Signed-off-by: Henry-Ruey Hsu <henryhsu@chromium.org> > Signed-off-by: Thierry Escande <thierry.escande@collabora.com> > --- > drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c > index 3d90a63..1a07a82 100644 > --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c > +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c > @@ -2790,6 +2790,7 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id) > unsigned long payload_size = 0; > enum vb2_buffer_state state = VB2_BUF_STATE_DONE; > bool interrupt_timeout = false; > + bool stream_error = false; > u32 irq_status; > > spin_lock(&jpeg->slock); > @@ -2806,6 +2807,11 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id) > > jpeg->irq_status |= irq_status; > > + if (irq_status & EXYNOS3250_STREAM_STAT) { If the problem which is supposed to be fixed happens on 5420, then why the 3250 variant is also affected by this patch? Shouldn't jpeg->variant->version be checked and equal SJPEG_EXYNOS5420? Andrzej
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 3d90a63..1a07a82 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -2790,6 +2790,7 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id) unsigned long payload_size = 0; enum vb2_buffer_state state = VB2_BUF_STATE_DONE; bool interrupt_timeout = false; + bool stream_error = false; u32 irq_status; spin_lock(&jpeg->slock); @@ -2806,6 +2807,11 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id) jpeg->irq_status |= irq_status; + if (irq_status & EXYNOS3250_STREAM_STAT) { + stream_error = true; + dev_err(jpeg->dev, "Syntax error or unrecoverable error occurred.\n"); + } + curr_ctx = v4l2_m2m_get_curr_priv(jpeg->m2m_dev); if (!curr_ctx) @@ -2822,7 +2828,7 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id) EXYNOS3250_RDMA_DONE | EXYNOS3250_RESULT_STAT)) payload_size = exynos3250_jpeg_compressed_size(jpeg->regs); - else if (interrupt_timeout) + else if (interrupt_timeout || stream_error) state = VB2_BUF_STATE_ERROR; else goto exit_unlock;