From patchwork Tue Oct 30 12:16:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 15290 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1TTAkc-0007M9-NL for patchwork@linuxtv.org; Tue, 30 Oct 2012 13:16:58 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1TTAkc-0003px-Ge; Tue, 30 Oct 2012 13:16:58 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933108Ab2J3MQy (ORCPT ); Tue, 30 Oct 2012 08:16:54 -0400 Received: from mail-ea0-f174.google.com ([209.85.215.174]:50646 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933367Ab2J3MQv (ORCPT ); Tue, 30 Oct 2012 08:16:51 -0400 Received: by mail-ea0-f174.google.com with SMTP id c13so82711eaa.19 for ; Tue, 30 Oct 2012 05:16:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=M0jwaJp7jJd1iD2y3P9Ss17Txiq2uk0W15kw7a0Mk98=; b=W8PoHYWyGaUkBph2vWWDWucg/4syBqJmdYvwX9fTU7Ao8zK9HaX9Naz9L0Edo55uy8 6tCDipUJG/D0uKGi1eUWitCkwuaZKKF/h2b9zRYNZ7ATU20kPGzg8rPqExacGdLwPp20 1NfIAMtIAq3rHXdbFolwp3u1A3wN2UyeCA9zejtq5Ef2VCUT5UmKvNqJZjJNUvhJapya c6ToyAo3MaENF+eweuz+ruug7j1Yr0fuogv7PyEft2xBsYKwB3vGYO0NUtyj9Goh1NIa nJcUlBBzr6a/xQFyjmfJRdwGJvtSD/8NzJOyNBGRjZ7X0LWQJJppXX2c+I5dZCFCNyn+ 8Udg== Received: by 10.14.184.2 with SMTP id r2mr72696463eem.43.1351599409760; Tue, 30 Oct 2012 05:16:49 -0700 (PDT) Received: from piscis.vsilicon.net (149.93.18.95.dynamic.jazztel.es. [95.18.93.149]) by mx.google.com with ESMTPS id f3sm1139497eeo.13.2012.10.30.05.16.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Oct 2012 05:16:49 -0700 (PDT) From: Javier Martin To: linux-media@vger.kernel.org Cc: g.liakhovetski@gmx.de, fabio.estevam@freescale.com, Javier Martin Subject: [PATCH 2/4] media: mx2_camera: Add image size HW limits. Date: Tue, 30 Oct 2012 13:16:33 +0100 Message-Id: <1351599395-16833-3-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351599395-16833-1-git-send-email-javier.martin@vista-silicon.com> References: <1351599395-16833-1-git-send-email-javier.martin@vista-silicon.com> X-Gm-Message-State: ALoCoQlvmyZtfwYJIOrdGEGRAEesvKsj8y4LNiSvVuUsCPNQEl///fyfnMwBo4RvL6W03IjG12E3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.10.30.120619 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The CSI has some constraints regarding image with. This patch makes sure those requirements are met in try_fmt(). Signed-off-by: Javier Martin --- drivers/media/platform/soc_camera/mx2_camera.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index e1b44b1..bf1178c 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c @@ -1234,7 +1234,11 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, return -EINVAL; } - /* FIXME: implement MX27 limits */ + /* + * With must be multiple of 8 as requested by the CSI. + * (Table 39-2 in the i.MX27 Reference Manual). + */ + pix->width &= ~0x7; /* limit to sensor capabilities */ mf.width = pix->width;