Received: by 2002:a05:7412:a9a3:b0:f9:327e:43ab with SMTP id o35csp44381rdh; Mon, 18 Dec 2023 04:03:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHi0KYGeoHm6QzY46BUfVtrUGyyxs2ZNrDg52r70FOOsyGUHWRoFwjl+dKCmnRi5I5AiOsR X-Received: by 2002:a17:907:7205:b0:a23:540d:c6d4 with SMTP id dr5-20020a170907720500b00a23540dc6d4mr516557ejc.192.1702900984415; Mon, 18 Dec 2023 04:03:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702900984; cv=none; d=google.com; s=arc-20160816; b=NIflccD9TH5kIGpX7wVx6nMajB55QwX/6M+sAbV2FREZWXu4yWxqwdNmfWIGxFzXe6 pk8MR28C4wVPyZKrPyTJWiVqS28I1OTgI9FyPS9Zto4mMIPQORLFeRxt3ySLKoiHhqSi X0SyZsuqyEEb0N/wWFypWuXZhhiPaD5eZWh5esOaQQoQhe2bK5NKgFlNEwGUh1zNs+oQ WFWmGSaJAvvuvNpYy1pRGsFFtOk0LTtYYiC9kp9SoC/pmENh0MhIF00FnwnpSJ9gukmb gtaTULbgl8CcuO1giQkT+KkDSVGYL7/6WZHsF2m2DNPq3QqpebNRXnEnOE2Jx/+iupML 6w2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=IgjCOqoU0LFb/prwwe/1yg1v3/KdI4fSVHRhtXMtDkA=; fh=YL4sK9lWJF+0xm1Zp3wdy3/DzOxZ7Q6XBCMrX4YtL4s=; b=Q6FjnV6Jb4UcpUMWZ8NRmLpuzS6TTrs9Hz51h3kFdwufAWHzlAFus/RzkriT0Mri9V Lgf73vjJaMv/eeRVBqJYCMTF2dkOx348ULu5Ej6+7BwvbVqXN51yZDNBTX6oZF3Z7esI HsikQ3rN489SoGkHNe912J69e/Mza4WgceUVyn3t+oy/cGjF7GSt/3/eFmB0sd5Nm+0P JbgoGtTB6EKNFa72cLiTln8SeZavAw3hgkXbs8uPqCpgJ/nl+Cor2hwAp1hFbhsTvU9i jX3EAAFBQUDmqFNGD+5M2qOkvgvyMqy8zbqj0/bHl/N3tF1I8dFEijEp9ekr94jNydnU 5tZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XRd15BuX; spf=pass (google.com: domain of linux-kernel+bounces-3518-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3518-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id s2-20020a170906500200b00a1e269eba03si9793079ejj.593.2023.12.18.04.03.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 04:03:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3518-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XRd15BuX; spf=pass (google.com: domain of linux-kernel+bounces-3518-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3518-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3C49A1F23953 for ; Mon, 18 Dec 2023 12:02:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D13AC1C6B5; Mon, 18 Dec 2023 11:58:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRd15BuX" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D27461C68C; Mon, 18 Dec 2023 11:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a234139b725so146717766b.3; Mon, 18 Dec 2023 03:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702900701; x=1703505501; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=IgjCOqoU0LFb/prwwe/1yg1v3/KdI4fSVHRhtXMtDkA=; b=XRd15BuXnbvJxtvbn0XtZtStezhgLm0HQHhP8hyv2CGzzoMAEDPuumej2a05usFEld TSlCCwidEqnsagZKQmmFTy6R29n8LURDoByMO3Js8hTEraLg+DPfInN0YdALrk7qJXgj +2p8IaS3ebwCVft1Y7Pukzz7GFlYRwUpxmGbhFqGwPj5dEzZ1t+niCT5y7tZ7FZYg76e ETulhZtPK9UyrR8INUpyxB33e/D31tWvyZVzZ8J+Jv0pMrVQxk2MatV7KUEaf34Lfe16 j1nXQzxWWC1LGTEGKPj3rUIJc2ioTu+Xn4VIo86inTCNLrhyx0BLkw8WszGAeanv8zqQ F+gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702900701; x=1703505501; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IgjCOqoU0LFb/prwwe/1yg1v3/KdI4fSVHRhtXMtDkA=; b=Gi/RmBbVvSTGB5YPpQ3iQ+AdF3cGy+z9G+8QcYjvOnFFTMcKy8zq58SfeVXzkJ9c/a QnC739od8lFLjNeu3/7BZVVHFli4/kQaYfGqHyKCGtLTUhv/8XZekbQ06C7eeqvvDDbb j4f++gwAXz7w344rzX6pUoxh7mLGCLzf9YMes3CFpDGsZ+vaB5C/DXZDA2iI6IUqZ1Go u++wYouKmk3CNxKWBKNOIU7D5HyluVjZdirvjwpcWVDpQwXJMWyOcGCKIG558z8Widz6 hVynst5DaB+LftQHavTHef/RpnYDQzeDOr20vsTfbBsCWC4dRg+jLpJFsKpIkYjiYGAv fbtQ== X-Gm-Message-State: AOJu0YwYX/cfCvzn+0mjplZDo9f3GhpB1zeG17UW7KhnX7sYcXf5Jg1J zyoTe4q30smz/vaQDuFBFKjF2osG/z8= X-Received: by 2002:a17:906:8b:b0:a1f:821b:1d9c with SMTP id 11-20020a170906008b00b00a1f821b1d9cmr4130333ejc.288.1702900700724; Mon, 18 Dec 2023 03:58:20 -0800 (PST) Received: from tom-HP-ZBook-Fury-15-G7-Mobile-Workstation (net-188-217-59-229.cust.vodafonedsl.it. [188.217.59.229]) by smtp.gmail.com with ESMTPSA id uv6-20020a170907cf4600b00a1e443bc037sm14188476ejc.147.2023.12.18.03.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 03:58:20 -0800 (PST) Date: Mon, 18 Dec 2023 12:58:18 +0100 From: Tommaso Merciai To: Laurent Pinchart Cc: linuxfancy@googlegroups.com, sakari.ailus@linux.intel.com, Martin Hecht , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3] media: i2c: alvium: store frame interval in subdev state Message-ID: References: <20231215082452.1720481-1-tomm.merciai@gmail.com> <20231215082452.1720481-4-tomm.merciai@gmail.com> <20231218025905.GJ5290@pendragon.ideasonboard.com> <20231218110331.GQ5290@pendragon.ideasonboard.com> <20231218113618.GA21105@pendragon.ideasonboard.com> <20231218114437.GB21105@pendragon.ideasonboard.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231218114437.GB21105@pendragon.ideasonboard.com> On Mon, Dec 18, 2023 at 01:44:37PM +0200, Laurent Pinchart wrote: > On Mon, Dec 18, 2023 at 12:39:53PM +0100, Tommaso Merciai wrote: > > On Mon, Dec 18, 2023 at 01:36:18PM +0200, Laurent Pinchart wrote: > > > On Mon, Dec 18, 2023 at 12:19:36PM +0100, Tommaso Merciai wrote: > > > > On Mon, Dec 18, 2023 at 01:03:31PM +0200, Laurent Pinchart wrote: > > > > > On Mon, Dec 18, 2023 at 11:30:38AM +0100, Tommaso Merciai wrote: > > > > > > On Mon, Dec 18, 2023 at 04:59:05AM +0200, Laurent Pinchart wrote: > > > > > > > On Fri, Dec 15, 2023 at 09:24:52AM +0100, Tommaso Merciai wrote: > > > > > > > > Use the newly added storage for frame interval in the subdev state to > > > > > > > > simplify the driver. > > > > > > > > > > > > > > > > Signed-off-by: Tommaso Merciai > > > > > > > > --- > > > > > > > > drivers/media/i2c/alvium-csi2.c | 40 ++++++++++----------------------- > > > > > > > > drivers/media/i2c/alvium-csi2.h | 2 -- > > > > > > > > 2 files changed, 12 insertions(+), 30 deletions(-) > > > > > > > > > > > > > > > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > > > > > > > > index fde456357be1..81f683b3c849 100644 > > > > > > > > --- a/drivers/media/i2c/alvium-csi2.c > > > > > > > > +++ b/drivers/media/i2c/alvium-csi2.c > > > > > > > > @@ -1643,25 +1643,6 @@ static int alvium_hw_init(struct alvium_dev *alvium) > > > > > > > > } > > > > > > > > > > > > > > > > /* --------------- Subdev Operations --------------- */ > > > > > > > > - > > > > > > > > -static int alvium_g_frame_interval(struct v4l2_subdev *sd, > > > > > > > > - struct v4l2_subdev_state *sd_state, > > > > > > > > - struct v4l2_subdev_frame_interval *fi) > > > > > > > > -{ > > > > > > > > - struct alvium_dev *alvium = sd_to_alvium(sd); > > > > > > > > - > > > > > > > > - /* > > > > > > > > - * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2 > > > > > > > > - * subdev active state API. > > > > > > > > - */ > > > > > > > > - if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE) > > > > > > > > - return -EINVAL; > > > > > > > > - > > > > > > > > - fi->interval = alvium->frame_interval; > > > > > > > > - > > > > > > > > - return 0; > > > > > > > > -} > > > > > > > > - > > > > > > > > static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > > > > > > struct v4l2_subdev_state *sd_state, > > > > > > > > struct v4l2_subdev_frame_interval *fi) > > > > > > > > @@ -1669,6 +1650,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > > > > > > struct alvium_dev *alvium = sd_to_alvium(sd); > > > > > > > > struct device *dev = &alvium->i2c_client->dev; > > > > > > > > u64 req_fr, dft_fr, min_fr, max_fr; > > > > > > > > + struct v4l2_fract *interval; > > > > > > > > int ret; > > > > > > > > > > > > > > > > /* > > > > > > > > > > > > > > You should drop the FIXME comment here and the ACTIVE check... > > > > > > > > > > > > Oks, thanks. > > > > > > > > > > > > > > @@ -1701,9 +1683,10 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > > > > > > > if (req_fr >= max_fr && req_fr <= min_fr) > > > > > > > > req_fr = dft_fr; > > > > > > > > > > > > > > > > - alvium->fr = req_fr; > > > > > > > > - alvium->frame_interval.numerator = fi->interval.numerator; > > > > > > > > - alvium->frame_interval.denominator = fi->interval.denominator; > > > > > > > > + interval = v4l2_subdev_state_get_interval(sd_state, 0); > > > > > > > > + > > > > > > > > + interval->numerator = fi->interval.numerator; > > > > > > > > + interval->denominator = fi->interval.denominator; > > > > > > > > > > > > > > > > > > > > > > ... and here only call alvium_set_frame_rate() for the ACTIVE frame > > > > > > > interval. > > > > > > > > > > > > I don't completely got this comment, can you give me more details about > > > > > > please. Thanks in advance! > > > > > > > > > > alvium_s_frame_interval() can be called both for the TRY and ACTIVE > > > > > status. The hardware registers should be written only for the ACTIVE > > > > > state. > > > > > > > > Do you think could be sufficient an if check like this? > > > > > > > > - return alvium_set_frame_rate(alvium, req_fr); > > > > + if (fi->which == V4L2_SUBDEV_FORMAT_ACTIVE) > > > > + return alvium_set_frame_rate(alvium, req_fr); > > > > + > > > > + return ret; > > > > > > That's the idea, yes. The "return ret" can become "return 0". Or you > > > could write > > > > > > if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE) > > > return 0; > > > > > > return alvium_set_frame_rate(alvium, req_fr); > > > > > > > } > > > > (This is my personal idea eh :) ) > > > > Maybe better: > > > > if (fi->which == V4L2_SUBDEV_FORMAT_ACTIVE) > > ret = alvium_set_frame_rate(alvium, req_fr); > > > > return ret; > > Works fine too (assuming ret gets initialized properly). Arg... good catch, thanks. :) I will take your proposal then into v2. Thanks again! :), Tommaso > > > > > > > > > @@ -1853,6 +1836,7 @@ static int alvium_init_state(struct v4l2_subdev *sd, > > > > > > > > { > > > > > > > > struct alvium_dev *alvium = sd_to_alvium(sd); > > > > > > > > struct alvium_mode *mode = &alvium->mode; > > > > > > > > + struct v4l2_fract *interval; > > > > > > > > struct v4l2_subdev_format sd_fmt = { > > > > > > > > .which = V4L2_SUBDEV_FORMAT_TRY, > > > > > > > > .format = alvium_csi2_default_fmt, > > > > > > > > @@ -1870,6 +1854,11 @@ static int alvium_init_state(struct v4l2_subdev *sd, > > > > > > > > *v4l2_subdev_state_get_crop(state, 0) = sd_crop.rect; > > > > > > > > *v4l2_subdev_state_get_format(state, 0) = sd_fmt.format; > > > > > > > > > > > > > > > > + /* Setup initial frame interval*/ > > > > > > > > + interval = v4l2_subdev_state_get_interval(state, 0); > > > > > > > > + interval->numerator = 1; > > > > > > > > + interval->denominator = ALVIUM_DEFAULT_FR_HZ; > > > > > > > > + > > > > > > > > return 0; > > > > > > > > } > > > > > > > > > > > > > > > > @@ -2239,7 +2228,7 @@ static const struct v4l2_subdev_pad_ops alvium_pad_ops = { > > > > > > > > .set_fmt = alvium_set_fmt, > > > > > > > > .get_selection = alvium_get_selection, > > > > > > > > .set_selection = alvium_set_selection, > > > > > > > > - .get_frame_interval = alvium_g_frame_interval, > > > > > > > > + .get_frame_interval = v4l2_subdev_get_frame_interval, > > > > > > > > .set_frame_interval = alvium_s_frame_interval, > > > > > > > > }; > > > > > > > > > > > > > > > > @@ -2260,11 +2249,6 @@ static int alvium_subdev_init(struct alvium_dev *alvium) > > > > > > > > struct v4l2_subdev *sd = &alvium->sd; > > > > > > > > int ret; > > > > > > > > > > > > > > > > - /* Setup initial frame interval*/ > > > > > > > > - alvium->frame_interval.numerator = 1; > > > > > > > > - alvium->frame_interval.denominator = ALVIUM_DEFAULT_FR_HZ; > > > > > > > > - alvium->fr = ALVIUM_DEFAULT_FR_HZ; > > > > > > > > - > > > > > > > > /* Setup the initial mode */ > > > > > > > > alvium->mode.fmt = alvium_csi2_default_fmt; > > > > > > > > alvium->mode.width = alvium_csi2_default_fmt.width; > > > > > > > > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > > > > > > > > index a6529b28e7dd..f5e26257b042 100644 > > > > > > > > --- a/drivers/media/i2c/alvium-csi2.h > > > > > > > > +++ b/drivers/media/i2c/alvium-csi2.h > > > > > > > > @@ -442,8 +442,6 @@ struct alvium_dev { > > > > > > > > s32 inc_sharp; > > > > > > > > > > > > > > > > struct alvium_mode mode; > > > > > > > > - struct v4l2_fract frame_interval; > > > > > > > > - u64 fr; > > > > > > > > > > > > > > The fr field should have been removed by a previous patch (the one that > > > > > > > will go between 1/3 an 2/3, see my review of 1/3) as shown by the fact > > > > > > > that this patch only removes two locations where the field is set but > > > > > > > none where it's read. > > > > > > > > > > > > > > > > > > > > > > > u8 h_sup_csi_lanes; > > > > > > > > u64 link_freq; > > -- > Regards, > > Laurent Pinchart