Received: by 2002:a05:7412:a9a3:b0:f9:327e:43ab with SMTP id o35csp17524rdh; Mon, 18 Dec 2023 03:03:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGyWP/UtFbKO2iT3pws4beZ8994S37qH07XeAT3yDB5ekDtluBnKwvW8+i86iwIGpp32T8T X-Received: by 2002:a05:6a20:3942:b0:187:3643:ecce with SMTP id r2-20020a056a20394200b001873643eccemr20482244pzg.56.1702897422968; Mon, 18 Dec 2023 03:03:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702897422; cv=none; d=google.com; s=arc-20160816; b=TapopKJ6dQqXzrUNHws85jpp7mORWGnN6BbPVZKF6fhgpmD0L/j4+G4+UBriusy+Ug Q2++ZaWe9r5m0PFG5pKmDbiuexuONmQD52VN4LTfW/h7waleVtySTCeFT3atp0wmmEsY CZuNH5A8A9/HZglsFrSdbCt634MTwPG1KYItV+eJ/xnSKqo9Yg0mDcMZV9C9aTFWo8CQ g4OBFkWQIlXCEhMy1R2G9gNIhnI89bvVxFVG41vE8YdIOId6vlwVO0JZJa2Y5vIM5QPj u0DcvGwHnnrxm1y/6EPHTDOAtOrq9cfmuq4qJx4EgqlKof9q1vlHNlB2+lvO3MaldQGu mZAw== 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=i9Vqg9j5WiaYYH+9maQ03RkQjkvsAQuaaPaoCcnxlTY=; fh=cqB3jvkIGLPqHYfnbOulxfH1CJnm8CVnas5gPCIFduU=; b=OWtHPsVBwwOXgrxEEqTCGGXZ/VTMQcyjZZN/ISZus3rTIG9jO2krKFbVkDvOdTA98/ O5pkLlzwQOKya7MTG9N1MBOtigVWmp8XNMdOlqh90iSl72FtIKQOk0UK0/lLF4Y2wDBJ XfVkhUMUVeue3vDC9iqAyhJa7t4QgLhlfOdpi69lTNKQP08i0RBBN5a38tGYwr7e3kA8 Cue9I/8hE8cCFoEEevw64miNc9V70Yrtt7hbgRXTjF+vqXCRyMUmGN8VMxzqYp9+XGv/ TXGtedWwwx/95qjPhRxbF+lc2Uae/T2B4uXjNypYavKeQ0cUHP7Yuzv8rY5pPJN/Gyrk mkzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=cN7glQ4v; spf=pass (google.com: domain of linux-kernel+bounces-3400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3400-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h10-20020a63e14a000000b005be34495eedsi17284418pgk.118.2023.12.18.03.03.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 03:03:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=cN7glQ4v; spf=pass (google.com: domain of linux-kernel+bounces-3400-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3400-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 9A31028408C for ; Mon, 18 Dec 2023 11:03:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ADF7518EA5; Mon, 18 Dec 2023 11:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cN7glQ4v" 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 AF97A1A59D; Mon, 18 Dec 2023 11:03:26 +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 B061857E; Mon, 18 Dec 2023 12:02:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1702897355; bh=Hs4zDcpAlPjEQR587odcjBPUdtoEfL2f0lHdH5doekw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=cN7glQ4v/S57bZpO8D77xcIN5i2/p0Prbd/1HLXzSs3sBeZxjbcbUyKpYvcVBkjpd zaYzYd0lzzHfnzlNyfN/U2LbgTqEhSv7BLNTXrK4i44wL2og4a1i0QEjqzQU/CPAqT ss0O/9goNhKZvo0EguF4yKY7hD28GZ1gBq76fmCY= Date: Mon, 18 Dec 2023 13:03:31 +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: <20231218110331.GQ5290@pendragon.ideasonboard.com> References: <20231215082452.1720481-1-tomm.merciai@gmail.com> <20231215082452.1720481-4-tomm.merciai@gmail.com> <20231218025905.GJ5290@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 11:30:38AM +0100, Tommaso Merciai wrote: > Hi Laurent, > > On Mon, Dec 18, 2023 at 04:59:05AM +0200, Laurent Pinchart wrote: > > Hi Tommaso, > > > > Thank you for the patch. > > > > 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. > > > 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