{"id":15849,"url":"https://patchwork.libcamera.org/api/1.1/patches/15849/?format=json","web_url":"https://patchwork.libcamera.org/patch/15849/","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-10-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:06","name":"[libcamera-devel,09/50] staging: media: imx: imx7-media-csi: Move format init to probe time","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"0cff6c283cd9c9c6ca07e79040edba79e6384ac2","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/15849/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/15849/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15849/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 9EE50C326E\n\tfor ;\n\tTue, 10 May 2022 11:52:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3B48F65654;\n\tTue, 10 May 2022 13:52:09 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 92EB96565D\n\tfor ;\n\tTue, 10 May 2022 13:52:04 +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 AE0F1BA9;\n\tTue, 10 May 2022 13:52:03 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183529;\n\tbh=zvOjg0QeN6mSFOMqPebQPsFhlL+PiY+QVPoTBCUk1fI=;\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=jJ2nXYq9kYqT2rX+Fj7zT04xpy4uWMqdF6yuZwhI6ekSTwNqp2hZff2nZcoL3q0s4\n\tvDNF0TqwHyKbSyFfCS4lgWAnd/XT/y7BrZ7uZl6z/xJQYuinmZWTRWec3+wBvQXB9n\n\tAlgLYabwYGYWgXYTye9ReTj1URHq8Fy+0bacCabG4JLhU8WHYMD7Jd3wIgUFCTa3UV\n\tSz4brSJJnLKu9ueA0E6Sijs5dvenqUT44HJ/htUhzlq+s+JxKmmfDf98wSPfDkVb2i\n\tP/ulwFwlE2MVFy/SWW6YR7QAFXEzwzlZ1f66HB92+4V6uIl5mkjOcfHn7oGaPgmZTT\n\tVmDOsjUioDyZw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183524;\n\tbh=zvOjg0QeN6mSFOMqPebQPsFhlL+PiY+QVPoTBCUk1fI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eNQBbn4nxIy02Fam+n4/tMaMkGBCmzKgtTYqd6vnAcmhZ7dS2ebrMyHxZWwW9YLJo\n\tgQFSZKmHXtan7ZZZMbvwVXmGLKPTL4n9Wz2wxSI0GBN5SeUXJ9s6wzuKQoK6HzugXz\n\tdX0U0wmul3VJQw6ZLoCDBaE0H7kApnubTCPuGPjw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eNQBbn4n\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:06 +0300","Message-Id":"<20220510115147.19360-10-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 09/50] staging: media: imx:\n\timx7-media-csi: Move format init to probe time","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":"There's no need to wait until the subdev is registered to initialize the\nactive pad formats. Do so at probe time.\n\nSigned-off-by: Laurent Pinchart \n---\n drivers/staging/media/imx/imx7-media-csi.c | 55 ++++++++++------------\n 1 file changed, 24 insertions(+), 31 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex cd063c4f3f40..d85b5ab204df 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -763,26 +763,6 @@ static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable)\n \treturn ret;\n }\n \n-static int imx7_csi_init_cfg(struct v4l2_subdev *sd,\n-\t\t\t struct v4l2_subdev_state *sd_state)\n-{\n-\tstruct imx7_csi *csi = v4l2_get_subdevdata(sd);\n-\tstruct v4l2_mbus_framefmt *mf;\n-\tint ret;\n-\tint i;\n-\n-\tfor (i = 0; i < IMX7_CSI_PADS_NUM; i++) {\n-\t\tmf = v4l2_subdev_get_try_format(sd, sd_state, i);\n-\n-\t\tret = imx_media_init_mbus_fmt(mf, 800, 600, 0, V4L2_FIELD_NONE,\n-\t\t\t\t\t &csi->cc[i]);\n-\t\tif (ret < 0)\n-\t\t\treturn ret;\n-\t}\n-\n-\treturn 0;\n-}\n-\n static struct v4l2_mbus_framefmt *\n imx7_csi_get_format(struct imx7_csi *csi,\n \t\t struct v4l2_subdev_state *sd_state,\n@@ -795,6 +775,28 @@ imx7_csi_get_format(struct imx7_csi *csi,\n \treturn &csi->format_mbus[pad];\n }\n \n+static int imx7_csi_init_cfg(struct v4l2_subdev *sd,\n+\t\t\t struct v4l2_subdev_state *sd_state)\n+{\n+\tconst enum v4l2_subdev_format_whence which =\n+\t\tsd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;\n+\tstruct imx7_csi *csi = v4l2_get_subdevdata(sd);\n+\tint ret;\n+\tint i;\n+\n+\tfor (i = 0; i < IMX7_CSI_PADS_NUM; i++) {\n+\t\tstruct v4l2_mbus_framefmt *mf =\n+\t\t\timx7_csi_get_format(csi, sd_state, i, which);\n+\n+\t\tret = imx_media_init_mbus_fmt(mf, 800, 600, 0, V4L2_FIELD_NONE,\n+\t\t\t\t\t &csi->cc[i]);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int imx7_csi_enum_mbus_code(struct v4l2_subdev *sd,\n \t\t\t\t struct v4l2_subdev_state *sd_state,\n \t\t\t\t struct v4l2_subdev_mbus_code_enum *code)\n@@ -1046,16 +1048,6 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)\n {\n \tstruct imx7_csi *csi = v4l2_get_subdevdata(sd);\n \tint ret;\n-\tint i;\n-\n-\tfor (i = 0; i < IMX7_CSI_PADS_NUM; i++) {\n-\t\t/* set a default mbus format */\n-\t\tret = imx_media_init_mbus_fmt(&csi->format_mbus[i],\n-\t\t\t\t\t 800, 600, 0, V4L2_FIELD_NONE,\n-\t\t\t\t\t &csi->cc[i]);\n-\t\tif (ret < 0)\n-\t\t\treturn ret;\n-\t}\n \n \tcsi->vdev = imx_media_capture_device_init(csi->sd.dev, &csi->sd,\n \t\t\t\t\t\t IMX7_CSI_PAD_SRC, false);\n@@ -1291,7 +1283,8 @@ static int imx7_csi_probe(struct platform_device *pdev)\n \tif (ret)\n \t\tgoto destroy_mutex;\n \n-\tret = v4l2_device_register_subdev(&csi->imxmd->v4l2_dev, &csi->sd);\n+\t/* Set the default mbus formats. */\n+\tret = imx7_csi_init_cfg(&csi->sd, NULL);\n \tif (ret)\n \t\tgoto media_cleanup;\n \n","prefixes":["libcamera-devel","09/50"]}