media: s5p-jpeg: Add stream error handling for Exynos5420 (80cdacaa) · Commits · 戴 / test

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> Acked-by:

Jacek Anaszewski <jacek.anaszewski@gmail.com> Signed-off-by:

Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@s-opensource.com>

drivers/media/platform/s5p-jpeg/jpeg-core.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -2813,6 +2813,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);
		@@ -2829,6 +2830,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)
		@@ -2845,7 +2852,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;

Admin message