| Message ID | 20231215082452.1720481-4-tomm.merciai@gmail.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-615-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9121444dys;
Fri, 15 Dec 2023 00:26:08 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEZFBOdNcL32/RWae+SssqpuNEy8RasU4FMLeuLzU2fhmKtlTuIM4iXKcbWaojwaAkNtC1t
X-Received: by 2002:a05:6808:22a6:b0:3ba:380:87ad with SMTP id
bo38-20020a05680822a600b003ba038087admr11013518oib.99.1702628768043;
Fri, 15 Dec 2023 00:26:08 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702628768; cv=none;
d=google.com; s=arc-20160816;
b=O1faFfOhJs4lad4pqrhoC9eLBst2OOye7hHoPXWQS4NFw8CrZOikYQOoJK3yC4aT0z
UWQxVJKnr3SfRnyf7Xi5AKJ9sFfnamqagX8SjlIo+aGVcAjVyTFNz7RIfijIpwlIwl0R
12dILOUH5CwwACPpGCAmbVxhCtVYEpE2O8QgGXZGxJ0Ph4Y205Cl4vKzqwCJUl7/Bsef
Xd2ge/sfYCY8ZWDFIBxHwPtRkf+wWs9Kr8cxyrwWE5yUOCuJiDdcbKj67x4RBTbnkrKc
Uf2zUL4ww8MTWO+96eNdF+H7mvcLH5lC++BWxyXfV6ldNCzLgbzjKm/MQkrOssrt4ELo
/thg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=content-transfer-encoding:mime-version:list-unsubscribe
:list-subscribe:list-id:precedence:references:in-reply-to:message-id
:date:subject:cc:to:from:dkim-signature;
bh=he8fe2wC1JFZq/a+xpBUGEzXjsc2JCt6WRN6YaAZE7s=;
fh=QTdZiDHA4VOqya5YEtWz1eoP1phH40Nxtf0DBXn+Bq8=;
b=y77YxE6SkpOpEkgZPEb8CAE32tjWONI0pWQEX3iOba5/ycVZXAtySzw0pgE2V62gtt
RDiRg6XKKFjmz6PxehL1blZCFPiOz4EjbLChPMStvNw33GCFjF2Sc17n9mVBUGuqGHZE
bqcbkm71Asucs/udN5MFBI6rzIJeh/6HwFJ1IcAmrJ8uQpr8VfP7JLafWvWzTfWZflp6
DRJYOPFOQGhSUOV0+eSw2mkx3y1v9ZQ2gdOBkJzIXPGb9M9Fv1OaxPxI2lMWqVLRPfy3
/Lq03o/mdVrFrWoawml5i1KS966czB0DuQQktsHQGkPDrxjftPTMtTp2ShfpNBXNmqxn
siqw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@gmail.com header.s=20230601 header.b=CRCyBPsI;
spf=pass (google.com: domain of
linux-kernel+bounces-615-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-615-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org.
[2604:1380:45e3:2400::1])
by mx.google.com with ESMTPS id
34-20020a630c62000000b005cd65dbd3basi573641pgm.683.2023.12.15.00.26.07
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 15 Dec 2023 00:26:08 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-615-ouuuleilei=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 header.i=@gmail.com header.s=20230601 header.b=CRCyBPsI;
spf=pass (google.com: domain of
linux-kernel+bounces-615-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45e3:2400::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-615-ouuuleilei=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 8D2AD2844B8
for <ouuuleilei@gmail.com>; Fri, 15 Dec 2023 08:26:07 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 66C6E19474;
Fri, 15 Dec 2023 08:25:08 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
header.b="CRCyBPsI"
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 24CE9179BE;
Fri, 15 Dec 2023 08:25:01 +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-a1f0616a15bso44121466b.2;
Fri, 15 Dec 2023 00:25:01 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1702628700; x=1703233500;
darn=vger.kernel.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=he8fe2wC1JFZq/a+xpBUGEzXjsc2JCt6WRN6YaAZE7s=;
b=CRCyBPsI1pfnsrQfwrwLJIGSAgdVINdvG3BChTidKwtK8deYRu/FdPCzvrbzPuy6n7
CfOgydB7waM29XVdj43iRdDjGpSXdLaBqsxnLwYHfz5eYdarJsuxulZiHv7x2MBzhtQd
Nl0HG5gmv/XfCtF8DtQxxbMIxL8tq9/OvcBE1is/T0xpB5t2kcgWXsSZt/IcEp5AaWwg
0I8yAUedAK0BgdiLxO2l9aQ5nmamFvc8Nut70OufK/rCTkZNlYtZkLpi38YI9sz8nqWr
7TTBPOucYKfX4OEwzKv8fzAgAGnRyMklTkp8MANTvPz457cs+KtcXxDa7LXCEGshyALY
tM6g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1702628700; x=1703233500;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=he8fe2wC1JFZq/a+xpBUGEzXjsc2JCt6WRN6YaAZE7s=;
b=EgfrY9NzZeZtctYArgMmmbpqDq0GqrdSKvc2vfUCsnawmAlzB4LVBGLAi39etTxody
aAuNcBSbpjbtMrNjdJMjnvHyU1EYJYx2vZphnXrdlUmqlH89oEdUh0qBAEKoYxFoh40o
F5vwxlmTdHqDt+XDyJTtE7t7oM6Jm2uVf/UKpwAYfpVe5r+hPEChA/hc1/UXbEQMPuVq
CKuNdXeo9CaJQscBZoFCO/hwRHo7/fSDZUc5h6hZjKc2+eeWW3pCRNzdF2cQwRHMCJSB
IBSDAFEKJFe9do5CRmAkJwVo8gMafrG2kd91Ymk6en51tBbwQ+AJvHvRQ45vGu/oTpot
0Ajw==
X-Gm-Message-State: AOJu0Yxnou+R8+f1LRiKmENwg9/MNehiK02xIjzidCnw4wrmoTIEhA7q
PsK8ZuAqq3jU0fL/ASHiQRU=
X-Received: by 2002:a17:906:225d:b0:a1d:251a:4056 with SMTP id
29-20020a170906225d00b00a1d251a4056mr5815033ejr.8.1702628700333;
Fri, 15 Dec 2023 00:25:00 -0800 (PST)
Received: from tom-HP-ZBook-Fury-15-G7-Mobile-Workstation.station
(net-188-217-59-229.cust.vodafonedsl.it. [188.217.59.229])
by smtp.gmail.com with ESMTPSA id
un7-20020a170907cb8700b00a1b65249053sm10395951ejc.128.2023.12.15.00.24.59
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 15 Dec 2023 00:24:59 -0800 (PST)
From: Tommaso Merciai <tomm.merciai@gmail.com>
To:
Cc: linuxfancy@googlegroups.com,
sakari.ailus@linux.intel.com,
laurent.pinchart@ideasonboard.com,
tomm.merciai@gmail.com,
Martin Hecht <martin.hecht@avnet.eu>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] media: i2c: alvium: store frame interval in subdev state
Date: Fri, 15 Dec 2023 09:24:52 +0100
Message-Id: <20231215082452.1720481-4-tomm.merciai@gmail.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20231215082452.1720481-1-tomm.merciai@gmail.com>
References: <20231215082452.1720481-1-tomm.merciai@gmail.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785335617743247471
X-GMAIL-MSGID: 1785335662976021161
|
| Series |
media: i2c: alvium: store frame interval in subdev state
|
|
Commit Message
Tommaso Merciai
Dec. 15, 2023, 8:24 a.m. UTC
Use the newly added storage for frame interval in the subdev state to
simplify the driver.
Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com>
---
drivers/media/i2c/alvium-csi2.c | 40 ++++++++++-----------------------
drivers/media/i2c/alvium-csi2.h | 2 --
2 files changed, 12 insertions(+), 30 deletions(-)
Comments
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 <tomm.merciai@gmail.com> > --- > 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... > @@ -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. > 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;
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 <tomm.merciai@gmail.com> > > --- > > 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! Regards, Tommaso > > > 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
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 <tomm.merciai@gmail.com> > > > --- > > > 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;
Hi Laurent, Thanks for your quick reply. 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: > > 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 <tomm.merciai@gmail.com> > > > > --- > > > > 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; } Thanks & Regards, 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
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 <tomm.merciai@gmail.com> > > > > > --- > > > > > 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;
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 <tomm.merciai@gmail.com> > > > > > > --- > > > > > > 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; What do you think? Regards, 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
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 <tomm.merciai@gmail.com> > > > > > > > --- > > > > > > > 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). > > > > > > > @@ -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;
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 <tomm.merciai@gmail.com> > > > > > > > > --- > > > > > > > > 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
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; /* @@ -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; 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; u8 h_sup_csi_lanes; u64 link_freq;