From patchwork Tue Oct 14 06:26:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 5078151 Return-Path: X-Original-To: patchwork-linux-sh@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 A13DB9FB83 for ; Tue, 14 Oct 2014 06:27:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D02EC20127 for ; Tue, 14 Oct 2014 06:27:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 497AB20154 for ; Tue, 14 Oct 2014 06:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754841AbaJNG1S (ORCPT ); Tue, 14 Oct 2014 02:27:18 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:54255 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754833AbaJNG1Q (ORCPT ); Tue, 14 Oct 2014 02:27:16 -0400 Received: by mail-pd0-f170.google.com with SMTP id p10so6969772pdj.15 for ; Mon, 13 Oct 2014 23:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s2urZZLB6PuRcze4WEj59WIWov6aQQhgBUp5MQGX9wo=; b=p53+bUntZqmrQc/wnhQyY7eG11VGLl3IGIqfx91zKBW3la+iTywYQI+homAAt6BiFW IgijXv+Z6d7uvNuIuNqcfJdixcFf6jAifHUFgRal64FpkMNCoxFdTca5K3XdRNFoskIF 2m6pmHcje7yUC7EwLzA8UPtaFPZ1wgpqUiegLSvbwf7sg2a68k/51w0wNMQlcOnAbGB3 n0jKQuERwNhWtJL1d625e/OnhNHGOkMr8iy+qDB69735Ad8XLnLxISoBlhH4mLxvtC6D ITm+sog/mPo0+q4bQSs7bA9BQirimugo89VmtVIx80suCb1QoujtsuFYewFijouEXxyI Kmjg== X-Received: by 10.69.0.230 with SMTP id bb6mr59055pbd.165.1413268035879; Mon, 13 Oct 2014 23:27:15 -0700 (PDT) Received: from localhost.localdomain (p5095-ipngn6701marunouchi.tokyo.ocn.ne.jp. [153.174.4.95]) by mx.google.com with ESMTPSA id nh8sm10324125pdb.25.2014.10.13.23.27.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Oct 2014 23:27:15 -0700 (PDT) From: Yoshihiro Kaneko To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH 3/3] media: soc_camera: rcar_vin: Add NV16 horizontal scaling-up support Date: Tue, 14 Oct 2014 15:26:53 +0900 Message-Id: <1413268013-8437-4-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413268013-8437-1-git-send-email-ykaneko0929@gmail.com> References: <1413268013-8437-1-git-send-email-ykaneko0929@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 From: Koji Matsuoka The scaling function had been forbidden for the capture format of NV16 until now. With this patch, a horizontal scaling-up function is supported to the capture format of NV16. a vertical scaling-up by the capture format of NV16 is forbidden for the H/W specification. Signed-off-by: Koji Matsuoka Signed-off-by: Yoshihiro Kaneko --- drivers/media/platform/soc_camera/rcar_vin.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 00bc98d..bf3588f 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -648,7 +648,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) /* output format */ switch (icd->current_fmt->host_fmt->fourcc) { case V4L2_PIX_FMT_NV16: - iowrite32(ALIGN(ALIGN(cam->width, 0x20) * cam->height, 0x80), + iowrite32(ALIGN((cam->out_width * cam->out_height), 0x80), priv->base + VNUVAOF_REG); dmr = VNDMR_DTMD_YCSEP; output_is_yuv = true; @@ -1622,9 +1622,19 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd, if (priv->error_flag == false) priv->error_flag = true; else { - if ((pixfmt == V4L2_PIX_FMT_NV16) && (pix->width & 0x1F)) { - dev_err(icd->parent, "Specified width error in NV16 format.\n"); - return -EINVAL; + if (pixfmt == V4L2_PIX_FMT_NV16) { + if (pix->width & 0x1F) { + dev_err(icd->parent, + "Specified width error in NV16 format. " + "Please specify the multiple of 32.\n"); + return -EINVAL; + } + if (pix->height != cam->height) { + dev_err(icd->parent, + "Vertical scaling-up error in NV16 format. " + "Please specify input height size.\n"); + return -EINVAL; + } } } @@ -1670,6 +1680,7 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd, case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_RGB565: case V4L2_PIX_FMT_RGB555X: + case V4L2_PIX_FMT_NV16: /* horizontal scaling-up only is supported */ can_scale = true; break; default: