Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3841127imm; Mon, 11 Jun 2018 02:42:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKXkYQiznpKMZigwoHMm5jo4FMunsi/cZ+0S3UNjsnOZbYADY3qllG5lnYNKWdW1p2tIq1r X-Received: by 2002:a17:902:b410:: with SMTP id x16-v6mr17692636plr.324.1528710153891; Mon, 11 Jun 2018 02:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528710153; cv=none; d=google.com; s=arc-20160816; b=j0aAGPiHKy4tXws93pPWrb6ocRYdpW788a4JvxjAau8Oz9NgB341zUZgIvYrI9byWu uF1meFH7HdYSdAKeyyAY4o02yDrFL0Cv94Qqso0yaHLkbBjDHj2NUM5/fx5bmKOgC4lU gIa2BDAdBhwN4fjgIdAec/yGI8dWwPX0t4XGrNvhrI3hfOr+6LDLGP3hOWpQ8kDHd8gM cN5u4YE7fWS95UMRz2xw5rU53ANE5ZadpTuXXOHHdqzeaO2V6cUjxa8xQk+BSUh0dppz ajNoNgyQIRixxfLWH42abpfvdW2hbSdWhIhezDdRmHFThKiqijw8cAD7j0GL8XFtWeBj 7l4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=hqLLg3yNWR9CIfFcXj7C00qtPKWykp5EVfrmKuPL35Y=; b=nrgBM9JTUoLffcY2kt4v6r+olK7NsxhjWIDPXV40MMWf+1QLeFIFwjdEJdqYnw2cz3 B7bNi3As3up6fHnvY+5eJMsaVzGW+jWdizAoo2CKL8m5Deuzl8kdnBFhfXkbGlQEFnwL SwZRG+UoCEPryF/shm4mNKDpxe/PN3yF/UnNDYXn8lN8P3Zg/wFEmNBYJfvPCyvzlpDH e3Ywd7A7HfJVDunAvUh3tW74kT+HkFyK8NzH9YhU5bOME/Wc4HPXt8ZGarZgdMdBL8ed 8vxBqzek7HIra+XGaDAFUn9EyP9QlbmFeTdl53T1+AsY0rm415YzwJgNiu17gqhlEE2G mRBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k187-v6si35199444pge.421.2018.06.11.02.42.19; Mon, 11 Jun 2018 02:42:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932748AbeFKJly (ORCPT + 99 others); Mon, 11 Jun 2018 05:41:54 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:47942 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932375AbeFKJlw (ORCPT ); Mon, 11 Jun 2018 05:41:52 -0400 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w5B9dIZT001743; Mon, 11 Jun 2018 11:41:33 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2jg4bwg913-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 11 Jun 2018 11:41:33 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id E37783F; Mon, 11 Jun 2018 09:41:32 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas24.st.com [10.75.90.94]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id B9B5724AE; Mon, 11 Jun 2018 09:41:32 +0000 (GMT) Received: from SAFEX1HUBCAS23.st.com (10.75.90.47) by Safex1hubcas24.st.com (10.75.90.94) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 11 Jun 2018 11:41:32 +0200 Received: from localhost (10.201.23.73) by webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 11 Jun 2018 11:41:31 +0200 From: Hugues Fruchet To: Maxime Coquelin , Alexandre Torgue , Mauro Carvalho Chehab , "Hans Verkuil" CC: , , , Benjamin Gaignard , Yannick Fertre , Hugues Fruchet Subject: [PATCH] media: stm32-dcmi: increase max width/height to 2592 Date: Mon, 11 Jun 2018 11:41:19 +0200 Message-ID: <1528710079-7944-1-git-send-email-hugues.fruchet@st.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.201.23.73] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-06-11_03:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DCMI can capture 5Mp raw frames, increase limit accordingly. Signed-off-by: Hugues Fruchet --- drivers/media/platform/stm32/stm32-dcmi.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c index 68da9ec..c55e6b5 100644 --- a/drivers/media/platform/stm32/stm32-dcmi.c +++ b/drivers/media/platform/stm32/stm32-dcmi.c @@ -90,14 +90,9 @@ enum state { }; #define MIN_WIDTH 16U -#define MAX_WIDTH 2048U +#define MAX_WIDTH 2592U #define MIN_HEIGHT 16U -#define MAX_HEIGHT 2048U - -#define MIN_JPEG_WIDTH 16U -#define MAX_JPEG_WIDTH 2592U -#define MIN_JPEG_HEIGHT 16U -#define MAX_JPEG_HEIGHT 2592U +#define MAX_HEIGHT 2592U #define TIMEOUT_MS 1000 @@ -844,14 +839,8 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f, } /* Limit to hardware capabilities */ - if (pix->pixelformat == V4L2_PIX_FMT_JPEG) { - pix->width = clamp(pix->width, MIN_JPEG_WIDTH, MAX_JPEG_WIDTH); - pix->height = - clamp(pix->height, MIN_JPEG_HEIGHT, MAX_JPEG_HEIGHT); - } else { - pix->width = clamp(pix->width, MIN_WIDTH, MAX_WIDTH); - pix->height = clamp(pix->height, MIN_HEIGHT, MAX_HEIGHT); - } + pix->width = clamp(pix->width, MIN_WIDTH, MAX_WIDTH); + pix->height = clamp(pix->height, MIN_HEIGHT, MAX_HEIGHT); /* No crop if JPEG is requested */ do_crop = dcmi->do_crop && (pix->pixelformat != V4L2_PIX_FMT_JPEG); -- 1.9.1