{"id":4166,"url":"https://patchwork.libcamera.org/api/1.1/patches/4166/?format=json","web_url":"https://patchwork.libcamera.org/patch/4166/","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":"<20200623164911.45147-4-jacopo@jmondi.org>","date":"2020-06-23T16:49:11","name":"[libcamera-devel,19/25] media: ov5647: Implement set_fmt pad operation","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"503d14ae9ac24fc657278bae9bab6e1cd074e24a","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/4166/mbox/","series":[{"id":1030,"url":"https://patchwork.libcamera.org/api/1.1/series/1030/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1030","date":"2020-06-23T10:07:50","name":"media: ov5647: Support RaspberryPi Camera Module v1","version":1,"mbox":"https://patchwork.libcamera.org/series/1030/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4166/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4166/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DE9AB60103\n\tfor ;\n\tTue, 23 Jun 2020 18:46:23 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id BE08F100004;\n\tTue, 23 Jun 2020 16:46:20 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"mchehab@kernel.org, sakari.ailus@linux.intel.com, hverkuil@xs4all.nl,\n\tlaurent.pinchart@ideasonboard.com, roman.kovalivskyi@globallogic.com, \n\tdave.stevenson@raspberrypi.org, naush@raspberrypi.com","Cc":"mrodin@de.adit-jv.com, hugues.fruchet@st.com, mripard@kernel.org,\n\taford173@gmail.com, sudipi@jp.adit-jv.com, andrew_gabbasov@mentor.com,\n\terosca@de.adit-jv.com, linux-media@vger.kernel.org,\n\tlibcamera-devel@lists.libcamera.org, Jacopo Mondi ","Date":"Tue, 23 Jun 2020 18:49:11 +0200","Message-Id":"<20200623164911.45147-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200623100815.10674-1-jacopo@jmondi.org>","References":"<20200623100815.10674-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 19/25] media: ov5647: Implement set_fmt\n\tpad operation","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","X-List-Received-Date":"Tue, 23 Jun 2020 16:46:24 -0000"},"content":"Now that the driver supports more than a single mode, implement the\n.set_fmt pad operation and adjust the existing .get_fmt one to report\nthe currently applied format.\n\nSigned-off-by: Jacopo Mondi \n---\n drivers/media/i2c/ov5647.c | 67 +++++++++++++++++++++++++++++++++++---\n 1 file changed, 62 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c\nindex af9e6d43967d8..39e320f321bd8 100644\n--- a/drivers/media/i2c/ov5647.c\n+++ b/drivers/media/i2c/ov5647.c\n@@ -1016,15 +1016,72 @@ static int ov5647_enum_frame_size(struct v4l2_subdev *sd,\n \treturn 0;\n }\n \n-static int ov5647_set_get_fmt(struct v4l2_subdev *sd,\n+static int ov5647_get_pad_fmt(struct v4l2_subdev *sd,\n \t\t\t struct v4l2_subdev_pad_config *cfg,\n \t\t\t struct v4l2_subdev_format *format)\n {\n \tstruct v4l2_mbus_framefmt *fmt = &format->format;\n+\tstruct v4l2_mbus_framefmt *sensor_format;\n+\tstruct ov5647 *sensor = to_sensor(sd);\n \n-\t/* Only one format is supported, so return that. */\n+\tmutex_lock(&sensor->lock);\n \tmemset(fmt, 0, sizeof(*fmt));\n-\t*fmt = OV5647_DEFAULT_FORMAT;\n+\n+\tswitch (format->which) {\n+\tcase V4L2_SUBDEV_FORMAT_TRY:\n+\t\tsensor_format = v4l2_subdev_get_try_format(sd, cfg, format->pad);\n+\t\tbreak;\n+\tdefault:\n+\t\tsensor_format = &sensor->mode->format;\n+\t\tbreak;\n+\t}\n+\n+\t*fmt = *sensor_format;\n+\tmutex_unlock(&sensor->lock);\n+\n+\treturn 0;\n+}\n+\n+static int ov5647_set_pad_fmt(struct v4l2_subdev *sd,\n+\t\t\t struct v4l2_subdev_pad_config *cfg,\n+\t\t\t struct v4l2_subdev_format *format)\n+{\n+\tstruct v4l2_mbus_framefmt *fmt = &format->format;\n+\tstruct ov5647 *sensor = to_sensor(sd);\n+\tstruct ov5647_mode *ov5647_mode_list;\n+\tstruct ov5647_mode *mode;\n+\tunsigned int num_modes;\n+\n+\t/*\n+\t * Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one\n+\t * is not supported.\n+\t */\n+\tif (fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8) {\n+\t\tov5647_mode_list = ov5647_sbggr8_modes;\n+\t\tnum_modes = ARRAY_SIZE(ov5647_sbggr8_modes);\n+\t} else {\n+\t\tov5647_mode_list = ov5647_sbggr10_modes;\n+\t\tnum_modes = ARRAY_SIZE(ov5647_sbggr10_modes);\n+\t}\n+\n+\tmode = v4l2_find_nearest_size(ov5647_mode_list, num_modes,\n+\t\t\t\t format.width, format.height,\n+\t\t\t\t fmt->width, fmt->height);\n+\n+\tif (format->which == V4L2_SUBDEV_FORMAT_TRY) {\n+\t\tmutex_lock(&sensor->lock);\n+\t\t*v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format;\n+\t\t*fmt = mode->format;\n+\t\tmutex_unlock(&sensor->lock);\n+\n+\t\treturn 0;\n+\t}\n+\n+\t/* Update the sensor mode and apply at it at streamon time. */\n+\tmutex_lock(&sensor->lock);\n+\tsensor->mode = mode;\n+\t*fmt = mode->format;\n+\tmutex_unlock(&sensor->lock);\n \n \treturn 0;\n }\n@@ -1068,8 +1125,8 @@ static int ov5647_get_selection(struct v4l2_subdev *sd,\n static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = {\n \t.enum_mbus_code\t\t= ov5647_enum_mbus_code,\n \t.enum_frame_size\t= ov5647_enum_frame_size,\n-\t.set_fmt\t\t= ov5647_set_get_fmt,\n-\t.get_fmt\t\t= ov5647_set_get_fmt,\n+\t.set_fmt\t\t= ov5647_set_pad_fmt,\n+\t.get_fmt\t\t= ov5647_get_pad_fmt,\n \t.get_selection\t\t= ov5647_get_selection,\n };\n \n","prefixes":["libcamera-devel","19/25"]}