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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAF24C433F5 for ; Sun, 13 Mar 2022 14:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234658AbiCMOqP (ORCPT ); Sun, 13 Mar 2022 10:46:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233811AbiCMOqO (ORCPT ); Sun, 13 Mar 2022 10:46:14 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9D787030D for ; Sun, 13 Mar 2022 07:45:06 -0700 (PDT) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E8C3D475; Sun, 13 Mar 2022 15:45:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1647182705; bh=JkkF62uwvuR00SNbrLKb2zKylSTzgt/lFgY71r2QAxg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XmcSQWj25rdWCLzJ9CvBuv4KJ83AW4mkIMVcQjUkwPb6gjScTtcKD0oGnn7RwYpET jZSe5QOP2aPq38FwlJR0zUUpRy0zMa6oXTLYq/y75Na4Zro1Y9+1Lp6e89M1Da7fw8 YSVtdBBn7tBJ1cLyK9bimPdZcO49BQ/xSBMWbrbA= Date: Sun, 13 Mar 2022 16:44:48 +0200 From: Laurent Pinchart To: Jacopo Mondi Cc: Chiranjeevi Rapolu , jeanmichel.hautbois@ideasonboard.com, paul.kocialkowski@bootlin.com, sakari.ailus@iki.fi, paul.elder@ideasonboard.com, Mauro Carvalho Chehab , "open list:OMNIVISION OV5670 SENSOR DRIVER" Subject: Re: [PATCH 6/6] media: i2c: ov5670: Add .get_selection() support Message-ID: References: <20220310130829.96001-1-jacopo@jmondi.org> <20220310130829.96001-7-jacopo@jmondi.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220310130829.96001-7-jacopo@jmondi.org> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Jacopo, Thank you for the patch. On Thu, Mar 10, 2022 at 02:08:29PM +0100, Jacopo Mondi wrote: > From: Jean-Michel Hautbois > > The ov5670 driver's v4l2_subdev_pad_ops currently does not include > .get_selection() - add support for that callback. > > Signed-off-by: Jean-Michel Hautbois > Signed-off-by: Jacopo Mondi > --- > drivers/media/i2c/ov5670.c | 64 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 64 insertions(+) > > diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c > index c9f69ffef210..1fa0d632c536 100644 > --- a/drivers/media/i2c/ov5670.c > +++ b/drivers/media/i2c/ov5670.c > @@ -70,6 +70,15 @@ > #define OV5670_REG_VALUE_16BIT 2 > #define OV5670_REG_VALUE_24BIT 3 > > +/* Pixel Array */ > + > +#define OV5670_NATIVE_WIDTH 2624 > +#define OV5670_NATIVE_HEIGHT 1980 > +#define OV5670_ACTIVE_START_TOP 8 > +#define OV5670_ACTIVE_START_LEFT 16 > +#define OV5670_ACTIVE_WIDTH 2592 > +#define OV5670_ACTIVE_HEIGHT 1944 > + > /* Initial number of frames to skip to avoid possible garbage */ > #define OV5670_NUM_OF_SKIP_FRAMES 2 > > @@ -2491,6 +2500,59 @@ static const struct v4l2_subdev_core_ops ov5670_core_ops = { > .unsubscribe_event = v4l2_event_subdev_unsubscribe, > }; > > +static void > +__ov5670_get_pad_crop(struct ov5670 *sensor, > + struct v4l2_subdev_state *state, unsigned int pad, > + enum v4l2_subdev_format_whence which, struct v4l2_rect *r) > +{ > + const struct ov5670_mode *mode = sensor->cur_mode; > + > + switch (which) { > + case V4L2_SUBDEV_FORMAT_TRY: > + *r = *v4l2_subdev_get_try_crop(&sensor->sd, state, pad); Where is the try crop rectangle initialized ? > + break; > + case V4L2_SUBDEV_FORMAT_ACTIVE: > + r->height = mode->height; > + r->width = mode->width; > + r->top = (OV5670_NATIVE_HEIGHT - mode->height) / 2; > + r->left = (OV5670_NATIVE_WIDTH - mode->width) / 2; There's a comment above stating /* * OV5670 sensor supports following resolutions with full FOV: * 4:3 ==> {2592x1944, 1296x972, 648x486} * 16:9 ==> {2560x1440, 1280x720, 640x360} */ so this doesn't look right. > + break; > + } > +} > + > +static int ov5670_get_selection(struct v4l2_subdev *subdev, > + struct v4l2_subdev_state *state, > + struct v4l2_subdev_selection *sel) > +{ > + struct ov5670 *sensor = to_ov5670(subdev); > + > + switch (sel->target) { > + case V4L2_SEL_TGT_CROP: > + mutex_lock(&sensor->mutex); > + __ov5670_get_pad_crop(sensor, state, sel->pad, > + sel->which, &sel->r); Wrong indentation. > + mutex_unlock(&sensor->mutex); > + break; > + case V4L2_SEL_TGT_NATIVE_SIZE: > + case V4L2_SEL_TGT_CROP_BOUNDS: > + sel->r.top = 0; > + sel->r.left = 0; > + sel->r.width = OV5670_NATIVE_WIDTH; > + sel->r.height = OV5670_NATIVE_HEIGHT; > + break; > + case V4L2_SEL_TGT_CROP_DEFAULT: > + sel->r.top = OV5670_ACTIVE_START_TOP; > + sel->r.left = OV5670_ACTIVE_START_LEFT; > + sel->r.width = OV5670_ACTIVE_WIDTH; > + sel->r.height = OV5670_ACTIVE_HEIGHT; > + break; > + default: > + return -EINVAL; > + } > + > + return 0; > +} > + > static const struct v4l2_subdev_video_ops ov5670_video_ops = { > .s_stream = ov5670_set_stream, > }; > @@ -2500,6 +2562,8 @@ static const struct v4l2_subdev_pad_ops ov5670_pad_ops = { > .get_fmt = ov5670_get_pad_format, > .set_fmt = ov5670_set_pad_format, > .enum_frame_size = ov5670_enum_frame_size, > + .get_selection = ov5670_get_selection, > + .set_selection = ov5670_get_selection, > }; > > static const struct v4l2_subdev_sensor_ops ov5670_sensor_ops = { -- Regards, Laurent Pinchart