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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 F205CC433FF for ; Fri, 9 Aug 2019 05:33:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C13E02171F for ; Fri, 9 Aug 2019 05:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405167AbfHIFd3 (ORCPT ); Fri, 9 Aug 2019 01:33:29 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:37145 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725890AbfHIFd3 (ORCPT ); Fri, 9 Aug 2019 01:33:29 -0400 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hvxWh-0003nm-2q; Fri, 09 Aug 2019 07:33:19 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1hvxWd-0006Cr-Hx; Fri, 09 Aug 2019 07:33:15 +0200 Date: Fri, 9 Aug 2019 07:33:15 +0200 From: Marco Felsch To: Jacopo Mondi Cc: mchehab@kernel.org, sakari.ailus@linux.intel.com, hans.verkuil@cisco.com, jacopo+renesas@jmondi.org, robh+dt@kernel.org, laurent.pinchart@ideasonboard.com, linux-media@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH v6 07/13] media: tvp5150: add FORMAT_TRY support for get/set selection handlers Message-ID: <20190809053315.mkgkui2jpvdxubrt@pengutronix.de> References: <20190415124413.18456-1-m.felsch@pengutronix.de> <20190415124413.18456-8-m.felsch@pengutronix.de> <20190506133555.yrxaeg5lbswzcd3i@uno.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190506133555.yrxaeg5lbswzcd3i@uno.localdomain> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 07:17:05 up 83 days, 11:35, 53 users, load average: 0.01, 0.04, 0.05 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Jacopo, On 19-05-06 15:36, Jacopo Mondi wrote: > Hi Marco, Sorry for the long time absence of this topic... > On Mon, Apr 15, 2019 at 02:44:07PM +0200, Marco Felsch wrote: > > Since commit 10d5509c8d50 ("[media] v4l2: remove g/s_crop from video ops") > > the 'which' field for set/get_selection must be FORMAT_ACTIVE. There is > > no way to try different selections. The patch adds a helper function to > > select the correct selection memory space (sub-device file handle or > > driver state) which will be set/returned. > > > > The TVP5150 AVID will be updated if the 'which' field is FORMAT_ACTIVE > > and the requested selection rectangle differs from the already set one. > > > > Signed-off-by: Marco Felsch > > --- > > Changelog: > > > > v5: > > - handle stub for v4l2_subdev_get_try_crop() internal since commit > > ("media: v4l2-subdev: add stubs for v4l2_subdev_get_try_*") > > isn't anymore part of this series. > > - add error handling of __tvp5150_get_pad_crop() > > v4: > > - fix merge conflict due to rebase on top of media-tree/master > > - __tvp5150_get_pad_crop(): cosmetic alignment fixes > > > > drivers/media/i2c/tvp5150.c | 130 ++++++++++++++++++++++++++---------- > > 1 file changed, 96 insertions(+), 34 deletions(-) > > > > diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c > > index 4e3228b2ccbc..9331609425bf 100644 > > --- a/drivers/media/i2c/tvp5150.c > > +++ b/drivers/media/i2c/tvp5150.c > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "tvp5150_reg.h" > > > > @@ -997,20 +998,48 @@ static void tvp5150_set_default(v4l2_std_id std, struct v4l2_rect *crop) > > crop->height = TVP5150_V_MAX_OTHERS; > > } > > > > +static struct v4l2_rect * > > +__tvp5150_get_pad_crop(struct tvp5150 *decoder, > > + struct v4l2_subdev_pad_config *cfg, unsigned int pad, > > + enum v4l2_subdev_format_whence which) > > +{ > > + switch (which) { > > + case V4L2_SUBDEV_FORMAT_TRY: > > +#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API) > > + return v4l2_subdev_get_try_crop(&decoder->sd, cfg, pad); > > +#else > > + return ERR_PTR(-ENOTTY); > > +#endif > > + case V4L2_SUBDEV_FORMAT_ACTIVE: > > + return &decoder->rect; > > + default: > > + return NULL; > > Do you need this default case? Can you return -EINVAL so that... I will change that, thanks. > > > + } > > +} > > + > > static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *format) > > { > > struct v4l2_mbus_framefmt *f; > > + struct v4l2_rect *__crop; > > struct tvp5150 *decoder = to_tvp5150(sd); > > > > if (!format || (format->pad != TVP5150_PAD_VID_OUT)) > > return -EINVAL; > > > > f = &format->format; > > + __crop = __tvp5150_get_pad_crop(decoder, cfg, format->pad, > > + format->which); > > + if (IS_ERR_OR_NULL(__crop)) { > > ... here you just need to check if (IS_ERR()) and return it? > > > + if (!__crop) > > + return -EINVAL; > > + else > > + return PTR_ERR(__crop); > > + } > > > > - f->width = decoder->rect.width; > > - f->height = decoder->rect.height / 2; > > + f->width = __crop->width; > > + f->height = __crop->height / 2; > > > > f->code = TVP5150_MBUS_FMT; > > f->field = TVP5150_FIELD; > > @@ -1021,17 +1050,51 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, > > return 0; > > } > > > > +unsigned int tvp5150_get_hmax(struct v4l2_subdev *sd) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + v4l2_std_id std; > > + > > + /* Calculate height based on current standard */ > > + if (decoder->norm == V4L2_STD_ALL) > > + std = tvp5150_read_std(sd); > > + else > > + std = decoder->norm; > > + > > + return (std & V4L2_STD_525_60) ? > > + TVP5150_V_MAX_525_60 : TVP5150_V_MAX_OTHERS; > > +} > > + > > +static inline void > > +__tvp5150_set_selection(struct v4l2_subdev *sd, struct v4l2_rect rect) > > +{ > > + struct tvp5150 *decoder = to_tvp5150(sd); > > + unsigned int hmax = tvp5150_get_hmax(sd); > > + > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > > + regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > > + rect.top + rect.height - hmax); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > > + rect.left >> TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > > + rect.left | (1 << TVP5150_CROP_SHIFT)); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > > + (rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > > + TVP5150_CROP_SHIFT); > > + regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB, > > + rect.left + rect.width - TVP5150_MAX_CROP_LEFT); > > +} > > + > > static int tvp5150_set_selection(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_selection *sel) > > { > > struct tvp5150 *decoder = to_tvp5150(sd); > > struct v4l2_rect rect = sel->r; > > - v4l2_std_id std; > > - int hmax; > > + struct v4l2_rect *__crop; > > + unsigned int hmax; > > > > - if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE || > > - sel->target != V4L2_SEL_TGT_CROP) > > + if (sel->target != V4L2_SEL_TGT_CROP) > > return -EINVAL; > > > > dev_dbg_lvl(sd->dev, 1, debug, "%s left=%d, top=%d, width=%d, height=%d\n", > > @@ -1040,17 +1103,7 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd, > > /* tvp5150 has some special limits */ > > rect.left = clamp(rect.left, 0, TVP5150_MAX_CROP_LEFT); > > rect.top = clamp(rect.top, 0, TVP5150_MAX_CROP_TOP); > > - > > - /* Calculate height based on current standard */ > > - if (decoder->norm == V4L2_STD_ALL) > > - std = tvp5150_read_std(sd); > > - else > > - std = decoder->norm; > > - > > - if (std & V4L2_STD_525_60) > > - hmax = TVP5150_V_MAX_525_60; > > - else > > - hmax = TVP5150_V_MAX_OTHERS; > > + hmax = tvp5150_get_hmax(sd); > > > > /* > > * alignments: > > @@ -1063,20 +1116,23 @@ static int tvp5150_set_selection(struct v4l2_subdev *sd, > > hmax - TVP5150_MAX_CROP_TOP - rect.top, > > hmax - rect.top, 0, 0); > > > > - regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_START, rect.top); > > - regmap_write(decoder->regmap, TVP5150_VERT_BLANKING_STOP, > > - rect.top + rect.height - hmax); > > - regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_MSB, > > - rect.left >> TVP5150_CROP_SHIFT); > > - regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_ST_LSB, > > - rect.left | (1 << TVP5150_CROP_SHIFT)); > > - regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_MSB, > > - (rect.left + rect.width - TVP5150_MAX_CROP_LEFT) >> > > - TVP5150_CROP_SHIFT); > > - regmap_write(decoder->regmap, TVP5150_ACT_VD_CROP_STP_LSB, > > - rect.left + rect.width - TVP5150_MAX_CROP_LEFT); > > + __crop = __tvp5150_get_pad_crop(decoder, cfg, sel->pad, sel->which); > > + if (IS_ERR_OR_NULL(__crop)) { > > + if (!__crop) > > + return -EINVAL; > > + else > > + return PTR_ERR(__crop); > > here too Simplified both thanks. > > > + } > > + > > + /* > > + * Update output image size if the selection (crop) rectangle size or > > + * position has been modified. > > + */ > > + if (!v4l2_rect_equal(&rect, __crop)) > > + if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE) > > Can this be a single condition? > Or maybe you could check if the rects are equal and this is a TRY and > return here. I squashed it into a single condition because your second approach won't cover the case if it is TRY and the rect changed. In that case the rect would be applied to the hw. > > > + __tvp5150_set_selection(sd, rect); > > > > - decoder->rect = rect; > > + *__crop = rect; > > > > return 0; > > } > > @@ -1086,11 +1142,9 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd, > > struct v4l2_subdev_selection *sel) > > { > > struct tvp5150 *decoder = container_of(sd, struct tvp5150, sd); > > + struct v4l2_rect *__crop; > > v4l2_std_id std; > > > > - if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE) > > - return -EINVAL; > > - > > switch (sel->target) { > > case V4L2_SEL_TGT_CROP_BOUNDS: > > sel->r.left = 0; > > @@ -1108,7 +1162,15 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd, > > sel->r.height = TVP5150_V_MAX_OTHERS; > > return 0; > > case V4L2_SEL_TGT_CROP: > > - sel->r = decoder->rect; > > + __crop = __tvp5150_get_pad_crop(decoder, cfg, sel->pad, > > + sel->which); > > + if (IS_ERR_OR_NULL(__crop)) { > > + if (!__crop) > > + return -EINVAL; > > + else > > + return PTR_ERR(__crop); > > + } This one as well. Thanks for the review. Regards, Marco > > + sel->r = *__crop; > > return 0; > > default: > > return -EINVAL; > > -- > > 2.20.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |