From patchwork Mon Jul 7 16:32:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 4496341 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 261189F390 for ; Mon, 7 Jul 2014 16:33:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52BA2202F0 for ; Mon, 7 Jul 2014 16:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 61873202EC for ; Mon, 7 Jul 2014 16:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210AbaGGQd2 (ORCPT ); Mon, 7 Jul 2014 12:33:28 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:57814 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157AbaGGQd2 (ORCPT ); Mon, 7 Jul 2014 12:33:28 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8C00HD5ONQJ470@mailout3.samsung.com>; Tue, 08 Jul 2014 01:33:26 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-da-53bacbd6e41a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 6F.14.04943.6DBCAB35; Tue, 08 Jul 2014 01:33:26 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8C00GK8OLKQW00@mmp2.samsung.com>; Tue, 08 Jul 2014 01:33:26 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, b.zolnierkie@samsung.com, linux-samsung-soc@vger.kernel.org, Jacek Anaszewski Subject: [PATCH 6/9] s5p-jpeg: Prevent erroneous downscaling for Exynos3250 SoC Date: Mon, 07 Jul 2014 18:32:07 +0200 Message-id: <1404750730-22996-7-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1404750730-22996-1-git-send-email-j.anaszewski@samsung.com> References: <1404750730-22996-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsVy+t9jQd1rp3cFGzzapWuxccZ6Voveq88Z Lc42vWG36NmwldVixvl9TA6sHn1bVjF6fN4kF8AUxWWTkpqTWZZapG+XwJWxdspE5oL5/BWH r3cxNjAe4Oli5OSQEDCRWLG/hxnCFpO4cG89G4gtJDCdUWLFCe8uRi4gu51JYteXk0wgCTYB Q4mfL16D2SIC8hJPem+wgRQxC3QySixs38AKkhAW8JdoOz0dzGYRUJXY9ew4mM0r4CHx5/ka 9i5GDqBtChJzJtmAhDkFPCUOL/vMChIWAio5+NpyAiPvAkaGVYyiqQXJBcVJ6bmGesWJucWl eel6yfm5mxjBAfJMagfjygaLQ4wCHIxKPLwrDu4KFmJNLCuuzD3EKMHBrCTCu2I5UIg3JbGy KrUoP76oNCe1+BCjNAeLkjjvgVbrQCGB9MSS1OzU1ILUIpgsEwenVANjTbrhbpH+qDlTXyee TjK/6Tq5m31V4u3Mdmu2eOWvPBs/Oh2tnDDX4MXaZdd1zt2fXRn99lJdpaP4t+lXSxc/upL6 8MyRj25ZP+TOzfy4eI1npqHphNobVydxO5naWp3jKo8oKzw04Y+99NT58h7NYTs1b14STVey leHuDmuyj9VVN5RTPqGoxFKckWioxVxUnAgAntVl4wwCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 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 JPEG codec on Exynos3250 SoC produces broken raw image if a JPEG is decoded to YUV420 format and downscaling by more then 2 is applied. Prevent this by asserting downscale ratio to 2. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 2491ef8..1ef004b 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1317,12 +1317,16 @@ static int exynos4_jpeg_get_output_buffer_size(struct s5p_jpeg_ctx *ctx, return w * h * fmt_depth >> 3; } +static int exynos3250_jpeg_try_downscale(struct s5p_jpeg_ctx *ctx, + struct v4l2_rect *r); + static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f) { struct vb2_queue *vq; struct s5p_jpeg_q_data *q_data = NULL; struct v4l2_pix_format *pix = &f->fmt.pix; struct v4l2_ctrl *ctrl_subs; + struct v4l2_rect scale_rect; unsigned int f_type; vq = v4l2_m2m_get_vq(ct->fh.m2m_ctx, f->type); @@ -1382,6 +1386,20 @@ static int s5p_jpeg_s_fmt(struct s5p_jpeg_ctx *ct, struct v4l2_format *f) ct->crop_rect.width = pix->width; ct->crop_rect.height = pix->height; } + + /* + * Prevent downscaling to YUV420 format by more than 2 + * for Exynos3250 SoC as it produces broken raw image + * in such cases. + */ + if (ct->mode == S5P_JPEG_DECODE && + f_type == FMT_TYPE_CAPTURE && + ct->jpeg->variant->version == SJPEG_EXYNOS3250 && + pix->pixelformat == V4L2_PIX_FMT_YUV420 && + ct->scale_factor > 2) { + scale_rect.width = ct->out_q.w / 2; + scale_rect.height = ct->out_q.h / 2; + exynos3250_jpeg_try_downscale(ct, &scale_rect); } return 0;