From patchwork Tue Nov 19 14:27:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 3202541 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CD2AB9F26C for ; Tue, 19 Nov 2013 14:28:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9F8B20318 for ; Tue, 19 Nov 2013 14:28:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8828B20360 for ; Tue, 19 Nov 2013 14:28:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753109Ab3KSO2J (ORCPT ); Tue, 19 Nov 2013 09:28:09 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:19233 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753032Ab3KSO2H (ORCPT ); Tue, 19 Nov 2013 09:28:07 -0500 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MWI006K9LIUBP10@mailout2.samsung.com> for linux-media@vger.kernel.org; Tue, 19 Nov 2013 23:28:06 +0900 (KST) X-AuditID: cbfee61a-b7f836d0000025d7-e3-528b7576702f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 51.D8.09687.6757B825; Tue, 19 Nov 2013 23:28:06 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MWI00IBKLHFEGB0@mmp1.samsung.com>; Tue, 19 Nov 2013 23:28:06 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, s.nawrocki@samsung.com, sw0312.kim@samsung.com, Jacek Anaszewski Subject: [PATCH 13/16] s5p-jpeg: Allow for wider JPEG subsampling scope for Exynos4x12 encoder Date: Tue, 19 Nov 2013 15:27:05 +0100 Message-id: <1384871228-6648-14-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1384871228-6648-1-git-send-email-j.anaszewski@samsung.com> References: <1384871228-6648-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t9jAd2y0u4gg21PdCx6rz5ntDjb9Ibd omfDVlaLw2/aWS1mTH7J5sDq0bdlFaPH501yAUxRXDYpqTmZZalF+nYJXBlT1sxlKXjLXvHp fwtzA+N1ti5GTg4JAROJSVt2s0PYYhIX7q0HiwsJLGKUaFwc2sXIBWS3M0ksuLCUESTBJmAo 8fPFayYQW0RAXuJJ7w2wBmaBGokpW2+ADRIWSJA4te4BWJxFQFWi8eEvli5GDg5eAQ+JVQvj QUwJAQWJOZNsQCo4gaJTFm5nh1jrLnF+40n2CYy8CxgZVjGKphYkFxQnpeca6hUn5haX5qXr JefnbmIEh8czqR2MKxssDjEKcDAq8fBOcO8KEmJNLCuuzD3EKMHBrCTC25jfHSTEm5JYWZVa lB9fVJqTWnyIUZqDRUmc90CrdaCQQHpiSWp2ampBahFMlomDU6qB8dQMhf8BG9hXBU84t/dP TvzBuq/eTz+a3PwiVfcyb8qaYHmBZ2obWGQnla6edebCJbk1TPLZb2/pvdaUFV/d1ne+TW2r 108Oph+T/W1YQovkJcoP3XqdN99KZ5WzI8ezO0umdW1j+PT735sFu9y1Ov/cKGP80PzyqsOi IN+kOvOQDwcLpyleUVJiKc5INNRiLipOBACI0ffiCwIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Exynos4x12 supports wider scope of subsampling modes than S5PC210. Adjust corresponding mask accordingly. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 15b2dea..319be0c 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1210,7 +1210,8 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx) v4l2_ctrl_new_std(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops, V4L2_CID_JPEG_RESTART_INTERVAL, 0, 3, 0xffff, 0); - mask = ~0x06; /* 422, 420 */ + if (ctx->jpeg->variant->version == SJPEG_S5P) + mask = ~0x06; /* 422, 420 */ } ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops,