{"id":15878,"url":"https://patchwork.libcamera.org/api/1.1/patches/15878/?format=json","web_url":"https://patchwork.libcamera.org/patch/15878/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220510115147.19360-39-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:35","name":"[libcamera-devel,38/50] staging: media: imx: imx7-media-csi: Make default formats consistent","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"a867c56d200bf02154e68c725177c1b28e8b8370","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15878/mbox/","series":[{"id":3106,"url":"https://patchwork.libcamera.org/api/1.1/series/3106/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3106","date":"2022-05-10T11:50:57","name":"staging: media: imx: Prepare destaging of imx7-media-csi","version":1,"mbox":"https://patchwork.libcamera.org/series/3106/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15878/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15878/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 69C4AC3271\n\tfor ;\n\tTue, 10 May 2022 11:52:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1D0BC656B5;\n\tTue, 10 May 2022 13:52:38 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 81ED76566A\n\tfor ;\n\tTue, 10 May 2022 13:52:29 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 99027E0C;\n\tTue, 10 May 2022 13:52:28 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183558;\n\tbh=B6WanzxxZOvDy0QJchsYwXbrY8qfDYztQWKS2dM7214=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=rVVhMvjNU6rjTXm+H8Dy/EmRWjRPnzXrNuiCPMW0kcUfBWjLohDqc1PvdvvIGnDBF\n\tOaMbxJfefaiek7qcUGgWykcAOUps/Ry3IttC+QZkYz3hE+t91MOlsqaWw+F4TKGbp9\n\t6RS/Q8p3f6M9wNe4gAyp6LMZ/cC0w3VFIYa/faqxdggVlVXWYduItZSDpCDcjo170g\n\t3LcDn/8W0kJnIFiMr+g+ivb6nCjgpyc5PJzC2pJMoZGe3nysJgY4IN+bfx+29AkPgB\n\tMXMNL7eM5nVQT4UoFIKcoUmiD3L7VZUIu/EH9+TtKtnbGR+S06ucMrFU2M2c1t9zmk\n\tSMxIIn6u7R25g==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183549;\n\tbh=B6WanzxxZOvDy0QJchsYwXbrY8qfDYztQWKS2dM7214=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=FBHlBG2n3RQR274QSbda4LMqvCn8B7MbCTffU62WnbmJN4Zld9H0A1t0ZhbG8ZCLX\n\tbcqAIi7UCtkv2vms5tXNHHxvYwDJdC8xmGK7+xN/sgL1dqkdUtaRHJgV6QSRHm9qXV\n\tokucRyhsxvnvysqki7eUHPAoYTgbrQZ3dbOSWvlw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"FBHlBG2n\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:35 +0300","Message-Id":"<20220510115147.19360-39-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.35.1","In-Reply-To":"<20220510115147.19360-1-laurent.pinchart@ideasonboard.com>","References":"<20220510115147.19360-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 38/50] staging: media: imx:\n\timx7-media-csi: Make default formats consistent","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Martin Kepplinger , kernel@pengutronix.de,\n\tDorota Czaplejewicz ,\n\tAlexander Stein ,\n\tRui Miguel Silva ,\n\tPhilipp Zabel , \n\tSteve Longerbeam ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use the same default image width and height for both the CSI subdev and\nthe video node to achieve a consistent default through the driver.\n\nSigned-off-by: Laurent Pinchart \n---\n drivers/staging/media/imx/imx7-media-csi.c | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex 6704e5d4d43b..bcf57aff3572 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -165,10 +165,11 @@\n #define IMX7_CSI_VIDEO_NAME\t\t\"imx-capture\"\n /* In bytes, per queue */\n #define IMX7_CSI_VIDEO_MEM_LIMIT\tSZ_64M\n-#define IMX7_CSI_VIDEO_DEF_PIX_WIDTH\t640\n-#define IMX7_CSI_VIDEO_DEF_PIX_HEIGHT\t480\n #define IMX7_CSI_VIDEO_EOF_TIMEOUT\t2000\n \n+#define IMX7_CSI_DEF_PIX_WIDTH\t\t640\n+#define IMX7_CSI_DEF_PIX_HEIGHT\t\t480\n+\n enum imx_csi_model {\n \tIMX7_CSI_IMX7 = 0,\n \tIMX7_CSI_IMX8MQ,\n@@ -303,7 +304,8 @@ static void imx7_csi_init_default(struct imx7_csi *csi)\n \timx7_csi_reg_write(csi, 0, CSI_CSICR2);\n \timx7_csi_reg_write(csi, BIT_FRMCNT_RST, CSI_CSICR3);\n \n-\timx7_csi_reg_write(csi, BIT_IMAGE_WIDTH(800) | BIT_IMAGE_HEIGHT(600),\n+\timx7_csi_reg_write(csi, BIT_IMAGE_WIDTH(IMX7_CSI_DEF_PIX_WIDTH) |\n+\t\t\t BIT_IMAGE_HEIGHT(IMX7_CSI_DEF_PIX_HEIGHT),\n \t\t\t CSI_CSIIMAG_PARA);\n \n \timx7_csi_reg_write(csi, BIT_DMA_REFLASH_RFF, CSI_CSICR3);\n@@ -1628,8 +1630,8 @@ static int imx7_csi_video_init_format(struct imx7_csi *csi)\n \t\t.which = V4L2_SUBDEV_FORMAT_ACTIVE,\n \t};\n \tfmt_src.format.code = MEDIA_BUS_FMT_UYVY8_2X8;\n-\tfmt_src.format.width = IMX7_CSI_VIDEO_DEF_PIX_WIDTH;\n-\tfmt_src.format.height = IMX7_CSI_VIDEO_DEF_PIX_HEIGHT;\n+\tfmt_src.format.width = IMX7_CSI_DEF_PIX_WIDTH;\n+\tfmt_src.format.height = IMX7_CSI_DEF_PIX_HEIGHT;\n \n \timx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &fmt_src.format, NULL);\n \tcsi->vdev_compose.width = fmt_src.format.width;\n@@ -1818,8 +1820,9 @@ static int imx7_csi_init_cfg(struct v4l2_subdev *sd,\n \t\tstruct v4l2_mbus_framefmt *mf =\n \t\t\timx7_csi_get_format(csi, sd_state, i, which);\n \n-\t\tret = imx7_csi_init_mbus_fmt(mf, 800, 600, 0, V4L2_FIELD_NONE,\n-\t\t\t\t\t &csi->cc[i]);\n+\t\tret = imx7_csi_init_mbus_fmt(mf, IMX7_CSI_DEF_PIX_WIDTH,\n+\t\t\t\t\t IMX7_CSI_DEF_PIX_HEIGHT, 0,\n+\t\t\t\t\t V4L2_FIELD_NONE, &csi->cc[i]);\n \t\tif (ret < 0)\n \t\t\treturn ret;\n \t}\n","prefixes":["libcamera-devel","38/50"]}