Received: by 2002:a05:7412:a9a3:b0:f9:327e:43ab with SMTP id o35csp33175rdh; Mon, 18 Dec 2023 03:38:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHsWGMmxjvBVwup8xGO47Wajn5kBW6wV4LrZ8+Z7tb9BQZllZMhm/6v2h2Q9JjqyOLv48O X-Received: by 2002:a05:6808:11cd:b0:3ba:130e:b3fe with SMTP id p13-20020a05680811cd00b003ba130eb3femr8933523oiv.63.1702899494811; Mon, 18 Dec 2023 03:38:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702899494; cv=none; d=google.com; s=arc-20160816; b=bm6QnJZm84JAZjGxk+oQ9+J4AfDnTUPdCS4X7G3TWL4FR3dpuEvYd4Mu9gCpzz2k3j hOBn+C2iecD+CTrXg4LXv2vt0Zm8jqvWaE/gUfQI+TVcT58cV9dwGhPd+ufPT/sARPcp 20DapC51g1ghkZbqjCB20f8ChbGF2xS/pGGn+HgCz3IabJFaBuNdg9wP4AGnUXpVwEw9 a1ORRC38d6xegNHURRk9zcF/OD+kNTAC0dnplbGHOcoKpCD1Oovb/ghLbEpP1wUcUsLm hMJgyekaTjnaQISt3YeKz1TWg932mZJZkLR73TKFQqNghuUUNaX/8WuJ1sak5jlgww46 /6wA== 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=1x/wXfmb6OfZZBfOqb/BiPOoEHNUM6a0L2yH/8hTCxU=; fh=cqB3jvkIGLPqHYfnbOulxfH1CJnm8CVnas5gPCIFduU=; b=lCFIVCrXf2iKVRLVCkzsjIhGzUDzn8uIX5tosHp/jiMxK42AvNvEMpdgrPT0OU6idR KINbCzlU7LH27FaHxeWf11Aqr6ZlfDeYbPbKlvX1ChXHfMdnBJiXF231CfXIk3vaLdwc 7qGrHxZVAUh4TiZwU1Z3WyqZJB8MuavibTgOpyMITKMQ9pJ4iR7es/go2ImlpmQQTZpE PFaAfa35Ir9CQzU56MltGOq0x6Ks8ulnbtxnD5VQQB2oS/zOeBqc8+vVYdJJ2VfPt9UC Av6FrBrBcztmKpDvj8hWRvbSLWv+LLXso2ocGgb07O1pb/AcENzDPyeGn0r92VSr7NYr JT7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=KMSTqs4k; spf=pass (google.com: domain of linux-kernel+bounces-3448-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3448-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id g19-20020a0ce4d3000000b0067f30b48efbsi4085392qvm.248.2023.12.18.03.38.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 03:38:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3448-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=KMSTqs4k; spf=pass (google.com: domain of linux-kernel+bounces-3448-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3448-linux.lists.archive=gmail.com@vger.kernel.org" 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 7D13D1C22CB0 for ; Mon, 18 Dec 2023 11:38:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F98F1A27E; Mon, 18 Dec 2023 11:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="KMSTqs4k" X-Original-To: linux-kernel@vger.kernel.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E79C21A29F; Mon, 18 Dec 2023 11:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 027AA57E; Mon, 18 Dec 2023 12:35:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1702899322; bh=DlUn6WLQnav2qrM8BwYmTkQcr3nL09A9JB515SmTe/o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=KMSTqs4k2m5ODqLXEqdda/ZLoGVuSKZBRE8jrJZYXFuxh3EXB4uRJXonukhhIov2y miTjnipnKKDQP7HEFabMuUfmHrY5xgU0PTkLceuAtGxOFyNECpvFOHazkzCRwBxFDs VSE1jSLhXX6Zo6L9X4mB0PurIk4nhRtTm9RR0j4I= Date: Mon, 18 Dec 2023 13:36:18 +0200 From: Laurent Pinchart To: Tommaso Merciai 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: <20231218113618.GA21105@pendragon.ideasonboard.com> 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> 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=utf-8 Content-Disposition: inline In-Reply-To: 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); > } > > > > > > @@ -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