Message ID | 1502191628-11958-5-git-send-email-andrzej.p@samsung.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-samsung-soc-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 44234601EB for <patchwork-linux-samsung-soc@patchwork.kernel.org>; Tue, 8 Aug 2017 11:27:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36C152879C for <patchwork-linux-samsung-soc@patchwork.kernel.org>; Tue, 8 Aug 2017 11:27:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BB5F287AB; Tue, 8 Aug 2017 11:27:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D628C2879C for <patchwork-linux-samsung-soc@patchwork.kernel.org>; Tue, 8 Aug 2017 11:27:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbdHHL1Y (ORCPT <rfc822;patchwork-linux-samsung-soc@patchwork.kernel.org>); Tue, 8 Aug 2017 07:27:24 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:59904 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751993AbdHHL1V (ORCPT <rfc822;linux-samsung-soc@vger.kernel.org>); Tue, 8 Aug 2017 07:27:21 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OUD001YY6HIR390@mailout4.w1.samsung.com>; Tue, 08 Aug 2017 12:27:18 +0100 (BST) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170808112717eucas1p2338be2a905d3520507ed27449066ec6d~Y21X3Je9Y2481024810eucas1p2M; Tue, 8 Aug 2017 11:27:17 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1.samsung.com (EUCPMTA) with SMTP id A9.83.12576.510A9895; Tue, 8 Aug 2017 12:27:17 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b~Y21XJvhPf2479724797eucas1p2E; Tue, 8 Aug 2017 11:27:17 +0000 (GMT) X-AuditID: cbfec7ef-f79ee6d000003120-87-5989a015cd4b Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 33.51.20118.510A9895; Tue, 8 Aug 2017 12:27:17 +0100 (BST) Received: from AMDC831.digital.local ([106.116.147.122]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OUD002SM6H90300@eusync1.samsung.com>; Tue, 08 Aug 2017 12:27:17 +0100 (BST) From: Andrzej Pietrasiewicz <andrzej.p@samsung.com> To: linux-samsung-soc@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>, Jacek Anaszewski <jacek.anaszewski@gmail.com>, Marek Szyprowski <m.szyprowski@samsung.com>, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, Thierry Escande <thierry.escande@collabora.com>, Krzysztof Kozlowski <krzk@kernel.org> Subject: [PATCH 5/5] media: platform: s5p-jpeg: directly use parsed subsampling on 5433 Date: Tue, 08 Aug 2017 13:27:08 +0200 Message-id: <1502191628-11958-5-git-send-email-andrzej.p@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1502191628-11958-1-git-send-email-andrzej.p@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIIsWRmVeSWpSXmKPExsWy7djP87qiCzojDdY16FrMetnOYrFxxnpW i9tbN7BYnD+/gd1i0+NrrBY9G7ayWsw4v4/JYu2Ru+wWq59VWPRfvcTmwOWx4+4SRo+ds+6y e2xa1cnmsXlJvceWfiCvb8sqRo/Pm+QC2KO4bFJSczLLUov07RK4MnqOv2YsaOSs6Pq4lbGB 8Q57FyMnh4SAicSfqw1MELaYxIV769m6GLk4hASWMUpM/3sHyvnMKPF5+TwghwOsY9Y+Wbii g+s+MEI4DUwSW240MIKMYhMwlth7sAPMFhHIkjg9qRFsBbPAFSaJn+v1QGxhgUiJz2t3sYHY LAKqEq9v32cBsXkFXCUOHfzEDHGSnMTJY5NZQWxOATeJj/dmsIMskxCYzi5xa+IlRoiLZCU2 HYCqd5G49vsPK4QtLPHq+BaoN2UkLk/uZoHoncwoseHmByhnO6PE2mMnoDqsJQ4fv8gKcSmf xKRt05khFvBKdLQJQZR4SEzqmgg11FHi4J9ZUN9fZZS4c/0rywRGmQWMDKsYRVJLi3PTU4sN 9YoTc4tL89L1kvNzNzECI/70v+PvdzA+bQ45xCjAwajEw8uQ2REpxJpYVlyZe4hRgoNZSYS3 b15npBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe26i2SCGB9MSS1OzU1ILUIpgsEwenVAPjEpP9 N7l8XJxu87Wy5T1jSfGcsONCWtKx0ImKxtdrkv//NeS4V7ZCZo1C4L+r9v0XQ+c/kRKTK17P cmPirokllZ69jnoCVfqH9+x5Imi6W4DJ5fnaK++9l5yweCPbwrBG5vXN7vXt7kK/9q2NXG2S znKwT5351LffoR7CXepn7crPTd/XrnpJiaU4I9FQi7moOBEA/60tv/QCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeLIzCtJLcpLzFFi42I5/e/4ZV3RBZ2RBj/e81jMetnOYrFxxnpW i9tbN7BYnD+/gd1i0+NrrBY9G7ayWsw4v4/JYu2Ru+wWq59VWPRfvcTmwOWx4+4SRo+ds+6y e2xa1cnmsXlJvceWfiCvb8sqRo/Pm+QC2KPcbDJSE1NSixRS85LzUzLz0m2VQkPcdC2UFPIS c1NtlSJ0fUOClBTKEnNKgTwjAzTg4BzgHqykb5fgltFz/DVjQSNnRdfHrYwNjHfYuxg5OCQE TCRm7ZPtYuQEMsUkLtxbz9bFyMUhJLCEUeLTlRZGCKeJSWL3hDmsIFVsAsYSew92MILYIgJZ Eofnz2IGKWIWuMEkcfTjRCaQqcICkRKz/iaB1LAIqEq8vn2fBcTmFXCVOHTwEzPENjmJk8cm g83kFHCT+HhvBjvEskZGiTuLbjBOYORdwMiwilEktbQ4Nz232EivODG3uDQvXS85P3cTIzD0 tx37uWUHY9e74EOMAhyMSjy8K9I6IoVYE8uKK3MPMUpwMCuJ8PbN64wU4k1JrKxKLcqPLyrN SS0+xGgKdNVEZinR5HxgXOaVxBuaGJpbGhoZW1iYGxkpifOqX26KFBJITyxJzU5NLUgtgulj 4uCUamBkYbGJaJLxf7Bv24fN5w1vHJogcIxH+1BIckKJYUSY4XkZxY2BGZN6Ft59mLEx1Mvz gVeZg1G1yevPn1ybAsp+STxTnLtBb+HhKx8seLIr4pOmdn2YnHOV2f5uOVNmz74mb6Grcw9t cZp2pbjI23aC67PaLXqtD2+0hhYWKHfE5q15e2RnnJwSS3FGoqEWc1FxIgDzlQjGkwIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 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: 20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b X-RootMTR: 20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b References: <1502191352-11595-1-git-send-email-andrzej.p@samsung.com> <1502191628-11958-1-git-send-email-andrzej.p@samsung.com> <CGME20170808112717eucas1p21f42a5991fc862df2d010a7ccfae634b@eucas1p2.samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-samsung-soc.vger.kernel.org> X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 492fab1..0225c82 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -627,10 +627,11 @@ static int s5p_jpeg_to_user_subsampling(struct s5p_jpeg_ctx *ctx) return V4L2_JPEG_CHROMA_SUBSAMPLING_411; return exynos3250_decoded_subsampling[ctx->subsampling]; case SJPEG_EXYNOS4: - case SJPEG_EXYNOS5433: if (ctx->subsampling > 2) return V4L2_JPEG_CHROMA_SUBSAMPLING_420; return exynos4x12_decoded_subsampling[ctx->subsampling]; + case SJPEG_EXYNOS5433: + return ctx->subsampling; /* parsed from header */ default: return V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY; }
On 5433 variant JPEG data is parsed by hardware only from SOS marker, so subsampling is parsed by software. As such, its value need not be translated from hardware-specific encoding to V4L2 encoding. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)