From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 783BBC2D0E4 for ; Thu, 19 Nov 2020 11:40:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1780C246F0 for ; Thu, 19 Nov 2020 11:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726578AbgKSLkB (ORCPT ); Thu, 19 Nov 2020 06:40:01 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:35487 "EHLO relay12.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726575AbgKSLkB (ORCPT ); Thu, 19 Nov 2020 06:40:01 -0500 Received: from uno.localdomain (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay12.mail.gandi.net (Postfix) with ESMTPSA id BACE220000C; Thu, 19 Nov 2020 11:39:55 +0000 (UTC) Date: Thu, 19 Nov 2020 12:39:58 +0100 From: Jacopo Mondi To: Sakari Ailus Cc: linux-media@vger.kernel.org, mchehab@kernel.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, roman.kovalivskyi@globallogic.com, dafna.hirschfeld@collabora.com, dave.stevenson@raspberrypi.org, naush@raspberrypi.com, erosca@de.adit-jv.com Subject: Re: [PATCH v3 18/29] media: ov5647: Implement set_fmt pad operation Message-ID: <20201119113958.nn3dohof4dwtmxdk@uno.localdomain> References: <20201109164934.134919-1-jacopo@jmondi.org> <20201109164934.134919-19-jacopo@jmondi.org> <20201118204235.GL3940@paasikivi.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201118204235.GL3940@paasikivi.fi.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Sakari, On Wed, Nov 18, 2020 at 10:42:35PM +0200, Sakari Ailus wrote: > Hi Jacopo, > > On Mon, Nov 09, 2020 at 05:49:23PM +0100, Jacopo Mondi wrote: > > Now that the driver supports more than a single mode, implement the > > .set_fmt pad operation and adjust the existing .get_fmt one to report > > the currently applied format. > > > > Signed-off-by: Jacopo Mondi > > --- > > drivers/media/i2c/ov5647.c | 66 +++++++++++++++++++++++++++++++++++--- > > 1 file changed, 62 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c > > index c65aacc0e04d3..68eab61d53493 100644 > > --- a/drivers/media/i2c/ov5647.c > > +++ b/drivers/media/i2c/ov5647.c > > @@ -1019,14 +1019,72 @@ static int ov5647_enum_frame_size(struct v4l2_subdev *sd, > > return 0; > > } > > > > -static int ov5647_set_get_fmt(struct v4l2_subdev *sd, > > +static int ov5647_get_pad_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *format) > > { > > struct v4l2_mbus_framefmt *fmt = &format->format; > > + const struct v4l2_mbus_framefmt *sensor_format; > > + struct ov5647 *sensor = to_sensor(sd); > > > > memset(fmt, 0, sizeof(*fmt)); > > - *fmt = OV5647_DEFAULT_FORMAT; > > + > > + mutex_lock(&sensor->lock); > > + switch (format->which) { > > + case V4L2_SUBDEV_FORMAT_TRY: > > + sensor_format = v4l2_subdev_get_try_format(sd, cfg, format->pad); > > + break; > > + default: > > + sensor_format = &sensor->mode->format; > > + break; > > + } > > + > > + *fmt = *sensor_format; > > + mutex_unlock(&sensor->lock); > > + > > + return 0; > > +} > > + > > +static int ov5647_set_pad_fmt(struct v4l2_subdev *sd, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_format *format) > > +{ > > + struct v4l2_mbus_framefmt *fmt = &format->format; > > + const struct ov5647_mode *ov5647_mode_list; > > + struct ov5647 *sensor = to_sensor(sd); > > + const struct ov5647_mode *mode; > > + unsigned int num_modes; > > + > > + /* > > + * Default mbus code MEDIA_BUS_FMT_SBGGR10_1X10 if the requested one > > + * is not supported. > > + */ > > + if (fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8) { > > + ov5647_mode_list = ov5647_8bpp_modes; > > + num_modes = ARRAY_SIZE(ov5647_8bpp_modes); > > + } else { > > + ov5647_mode_list = ov5647_10bpp_modes; > > + num_modes = ARRAY_SIZE(ov5647_10bpp_modes); > > + } > > It'd be nicer if you could obtain the above information from an array where > there's entry for each format. The above checks have a tendency to repeat > themselves in a number of places. > Indeed I could replace this with a for loop like it's done in enum_frame_sizes... I'll fix > > + > > + mode = v4l2_find_nearest_size(ov5647_mode_list, num_modes, > > + format.width, format.height, > > + fmt->width, fmt->height); > > + > > + if (format->which == V4L2_SUBDEV_FORMAT_TRY) { > > + mutex_lock(&sensor->lock); > > + *v4l2_subdev_get_try_format(sd, cfg, format->pad) = mode->format; > > + *fmt = mode->format; > > + mutex_unlock(&sensor->lock); > > + > > + return 0; > > + } > > + > > + /* Update the sensor mode and apply at it at streamon time. */ > > + mutex_lock(&sensor->lock); > > + sensor->mode = mode; > > + *fmt = mode->format; > > + mutex_unlock(&sensor->lock); > > > > return 0; > > } > > @@ -1071,8 +1129,8 @@ static int ov5647_get_selection(struct v4l2_subdev *sd, > > static const struct v4l2_subdev_pad_ops ov5647_subdev_pad_ops = { > > .enum_mbus_code = ov5647_enum_mbus_code, > > .enum_frame_size = ov5647_enum_frame_size, > > - .set_fmt = ov5647_set_get_fmt, > > - .get_fmt = ov5647_set_get_fmt, > > + .set_fmt = ov5647_set_pad_fmt, > > + .get_fmt = ov5647_get_pad_fmt, > > .get_selection = ov5647_get_selection, > > }; > > > > -- > Sakari Ailus