From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752962AbdF2MFk (ORCPT ); Thu, 29 Jun 2017 08:05:40 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:57393 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbdF2MFJ (ORCPT ); Thu, 29 Jun 2017 08:05:09 -0400 X-AuditID: cbfec7ef-f796a6d00000373c-97-5954ecf52444 Subject: Re: [PATCH v3 8/8] [media] s5p-jpeg: Add stream error handling for Exynos5420 To: Thierry Escande , Jacek Anaszewski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org From: Andrzej Pietrasiewicz Message-id: <49c2b7a9-2e0a-e8e0-1b34-f1eaf45fe4dc@samsung.com> Date: Thu, 29 Jun 2017 14:05:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-version: 1.0 In-reply-to: <1498579734-1594-9-git-send-email-thierry.escande@collabora.com> Content-type: text/plain; charset=utf-8; format=flowed Content-language: en-US Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNKsWRmVeSWpSXmKPExsWy7djP87pf34REGhz8q2xxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYInisklJzcksSy3St0vg yrj+opet4A1/ReuTs6wNjF95uhg5OSQETCSOH+lkg7DFJC7cWw9mCwksY5T4Oleii5ELyP7M KHHo51J2uIb3j1jgitY0VkIUvWCUeHL8KTNIQlggQuLV5RUsIAkRgQmMEge27QTrZhawleg4 1AnWzSZgLLH3YAcjiM0rYCex5cwssNUsAqoSu6ZcALNFgQYtmjSRHaJGUOLH5HtgvZwCvhI/ Pz+Hmmkl8exfKyuELS7R3HqTBcKWl9i85i0zyBESAvPYJf5O3Ak0lAPIkZXYdIAZ4hsXiWnH 5zJB2MISr45vgfpSRqKz4yATRO9kRokNNz+wQDjbGSXWHjvBClFlLXH4+EWozXwSk7ZNZ4ZY wCvR0SYEUeIhMeXaF6ihjhKrzn1hhATXY0aJzqlnWCYwKsxC8twsJA/NQvLQLCQPLWBkWcUo klpanJueWmyoV5yYW1yal66XnJ+7iRGYZE7/O/5+B+PT5pBDjAIcjEo8vAxrgyOFWBPLiitz DzFKcDArifAyvwiJFOJNSaysSi3Kjy8qzUktPsQozcGiJM7Le+pahJBAemJJanZqakFqEUyW iYNTqoFRqG3S4Yf/7OqviO7+LyKo8uhK/P/X3arnjyhe89krvPRDqij/1tM909rqRI+bFank Gte/Oece+ypjz58CZf5Xp99yqy9Wv8+8Jt/yWFm+laZU1oJbTdN1LFxUF3mtcknKu7XysGFz k3GxxSn1+gPex3dl1jXm901+1pkdeCqlgv0Am/oZvulKLMUZiYZazEXFiQAfb4Z/LgMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsVy+t/xa7qf3oREGlyfpmJxe+sGFovLu+aw WfRs2MpqsWzTHyaL/quX2BxYPXbcXcLosXPWXXaPTas62Tw+b5ILYIlys8lITUxJLVJIzUvO T8nMS7dVCg1x07VQUshLzE21VYrQ9Q0JUlIoS8wpBfKMDNCAg3OAe7CSvl2CW8b1F71sBW/4 K1qfnGVtYPzK08XIySEhYCJx/P0jFghbTOLCvfVsXYxcHEICSxglZp+fCuW8YJS49HkhWJWw QITEq8srWEASIgKTGCVWbv3LBJJgFrCV6DjUyQLR8ZhR4s2H5awgCTYBY4m9BzsYQWxeATuJ LWdmsYHYLAKqErumXACzRYGm7rp+gBWiRlDix+R7YNs4BXwlfn5+zg6xwEziy8vDrBC2uERz 600WCFteYvOat8wTGAVnIWmfhaRlFpKWWUhaFjCyrGIUSS0tzk3PLTbUK07MLS7NS9dLzs/d xAiMuW3Hfm7ewXhpY/AhRgEORiUe3hWrgiOFWBPLiitzDzFKcDArifAyvwiJFOJNSaysSi3K jy8qzUktPsRoCvTcRGYp0eR8YDrIK4k3NDE0tzQ0MrawMDcyUhLnLflwJVxIID2xJDU7NbUg tQimj4mDU6qBsTKqxcH1g4ZbYTfz74du7HOucPHqxX93E1u6VOxh0p5NBgE6bc/07bMWblvk 8OJtraQQw22W4vLFqUr9+UJ7N/ooTexTlDe5uXeraSlf+I+bzEZp/w6nJ6x73LmXMX3tW+9T b/crzm+/8borUKZYKZ0j72ObksFEdpd3HfNyYjW6OybI6fArsRRnJBpqMRcVJwIA1pjaUc8C AAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170629120506eucas1p15ab9ac2e16ec370ce157355558a7228a X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBQaWV0cmFzaWV3aWN6G1NSUE9MLUtlcm5lbCAo?= =?UTF-8?B?VFApG+yCvOyEseyghOyekBtTZW5pb3IgU29mdHdhcmUgRW5naW5lZXI=?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBUb21hc3ogUGlldHJhc2lld2ljehtTUlBPTC1L?= =?UTF-8?B?ZXJuZWwgKFRQKRtTYW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2Fy?= =?UTF-8?B?ZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170627160932epcas2p19f4a8b32be3d42d51a53572a0929d0ba X-RootMTR: 20170627160932epcas2p19f4a8b32be3d42d51a53572a0929d0ba References: <1498579734-1594-1-git-send-email-thierry.escande@collabora.com> <1498579734-1594-9-git-send-email-thierry.escande@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 27.06.2017 o 18:08, Thierry Escande pisze: > From: henryhsu > > 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 > Signed-off-by: Thierry Escande Acked-by: Andrzej Pietrasiewicz > --- > 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; >