Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1677656
| From | Andrzej Pietrasiewicz <andrzej.p@samsung.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v3 8/8] [media] s5p-jpeg: Add stream error handling for Exynos5420 |
| Date | 2017-06-29 14:10 +0200 |
| Message-ID | <tXGqK-7pH-7@gated-at.bofh.it> (permalink) |
| References | <tX1dT-2UD-7@gated-at.bofh.it> <tXGqK-7pH-9@gated-at.bofh.it> <tX1dV-2UD-55@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
W dniu 27.06.2017 o 18:08, 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>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
> ---
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index 5ad3d43..c35d169 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -2812,6 +2812,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);
> @@ -2828,6 +2829,12 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id)
>
> jpeg->irq_status |= irq_status;
>
> + if (jpeg->variant->version == SJPEG_EXYNOS5420 &&
> + 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)
> @@ -2844,7 +2851,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;
>
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH v3 8/8] [media] s5p-jpeg: Add stream error handling for Exynos5420 Thierry Escande <thierry.escande@collabora.com> - 2017-06-27 18:10 +0200 Re: [PATCH v3 8/8] [media] s5p-jpeg: Add stream error handling for Exynos5420 Andrzej Pietrasiewicz <andrzej.p@samsung.com> - 2017-06-29 14:10 +0200
csiph-web