Message ID | 20191129190541.30315-5-manivannan.sadhasivam@linaro.org (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from <linux-media-owner@vger.kernel.org>) id 1ialap-00A1aP-6I; Fri, 29 Nov 2019 19:06:15 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727230AbfK2TGT (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Fri, 29 Nov 2019 14:06:19 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:38165 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727213AbfK2TGR (ORCPT <rfc822;linux-media@vger.kernel.org>); Fri, 29 Nov 2019 14:06:17 -0500 Received: by mail-pj1-f65.google.com with SMTP id l4so2280711pjt.5 for <linux-media@vger.kernel.org>; Fri, 29 Nov 2019 11:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/FM9xo7QIIBKERzlsc9RY2lQmdtL0uWG+xaaghB/dV4=; b=tNqp5p7dcPlaZftpP3TycmCHaYycdBuJHeVbtDykKAoJibe93S5N8XsAUYK9ayfAcl Iaw1JF/4vRMyErNfvVyZm2qWAKkrV0SakuAY7meg13MWatjW1Ob2Byu2+QJoeCPV+r0d VgnBSHlvUbgxIiU8k1S3UAy0/pnc0urZFPkQL/ChnqlyO1A3mv0znx6AU+mS5A+hUDBc 3NLPVkZE+F+tWYSGU2PlGSm3CSmuEPS/uVSKr+uIqkM8qaC8ilzsCLoI6utdaggXBFps Y+FUI2/lkIlOWLfNxaduQYR0K5UI4frt90Mc4OszFfpizS+NqPqTAbwEarlLoOmOkr3E 2KqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/FM9xo7QIIBKERzlsc9RY2lQmdtL0uWG+xaaghB/dV4=; b=RSqkd8EhIvKGYz3DCri8+5sS7dyGbGQzZ+zu0taoqB8vnrCF8OTFnUxXt9wWTxtlvz d3MyXJ2iCo6igpvg5yNUYhASVYOpqola2jF71ENVtUMxiRH9tKNepI62er90IDubY6uL 6uCjxjmCgS1pMs92TYraLUvCraBLtwsYzi2kgJUKxLU4njp08uw7BT6jom5mcLIiLble JdXfZY4rWl9xs//HqHzub/L5oBHcGh/MZj3H1IZY4mXY7BErCdglQFgU8GvLoSu1HL2d BDx+8ZAilZe5kB9m6ejNQ1qOHE1Z7O/YkAA3GrnqdcOAIfJp8/rG5W+O9spAe+Ef2aet OSUQ== X-Gm-Message-State: APjAAAUHHecOwepITOU05AqFwZnOtjGmMBamoaGEgV2fH33PW7QQNDHl NSDAQVvLs3uWtA6FPeSO+aZ8 X-Google-Smtp-Source: APXvYqw99CLh8HXavEoyULyhtO2nxTDFigWCoqEaIX82JYh7hHk+VlWTCUefWQFUD7lg1xwR+i2dYw== X-Received: by 2002:a17:902:820f:: with SMTP id x15mr16072824pln.125.1575054375293; Fri, 29 Nov 2019 11:06:15 -0800 (PST) Received: from localhost.localdomain ([2409:4072:638d:cc55:d006:f721:cde2:1059]) by smtp.gmail.com with ESMTPSA id h9sm25159974pgk.84.2019.11.29.11.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 11:06:14 -0800 (PST) From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> To: mchehab@kernel.org, sakari.ailus@iki.fi Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, c.barrett@framos.com, a.brela@framos.com, peter.griffin@linaro.org, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Subject: [PATCH 4/5] media: i2c: imx290: Add support to enumerate all frame sizes Date: Sat, 30 Nov 2019 00:35:40 +0530 Message-Id: <20191129190541.30315-5-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191129190541.30315-1-manivannan.sadhasivam@linaro.org> References: <20191129190541.30315-1-manivannan.sadhasivam@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Series |
Improvements to IMX290 CMOS driver
|
|
Commit Message
Manivannan Sadhasivam
Nov. 29, 2019, 7:05 p.m. UTC
Add support to enumerate all frame sizes supported by IMX290. This is
required for using with userspace tools such as libcamera.
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
Comments
On Sat, Nov 30, 2019 at 12:35:40AM +0530, Manivannan Sadhasivam wrote: > Add support to enumerate all frame sizes supported by IMX290. This is > required for using with userspace tools such as libcamera. > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > index d5bb3a59ac46..f26c4a0ee0a0 100644 > --- a/drivers/media/i2c/imx290.c > +++ b/drivers/media/i2c/imx290.c > @@ -468,6 +468,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > return 0; > } > > +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, > + struct v4l2_subdev_pad_config *cfg, > + struct v4l2_subdev_frame_size_enum *fse) > +{ > + if ((fse->code != imx290_formats[0].code) && > + (fse->code != imx290_formats[1].code)) Please use a loop over imx290_formats instead. > + return -EINVAL; > + > + if (fse->index >= ARRAY_SIZE(imx290_modes)) > + return -EINVAL; > + > + fse->min_width = imx290_modes[fse->index].width; > + fse->max_width = imx290_modes[fse->index].width; > + fse->min_height = imx290_modes[fse->index].height; > + fse->max_height = imx290_modes[fse->index].height; > + > + return 0; > +} > + > static int imx290_get_fmt(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_format *fmt) > @@ -820,6 +839,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { > static const struct v4l2_subdev_pad_ops imx290_pad_ops = { > .init_cfg = imx290_entity_init_cfg, > .enum_mbus_code = imx290_enum_mbus_code, > + .enum_frame_size = imx290_enum_frame_size, > .get_fmt = imx290_get_fmt, > .set_fmt = imx290_set_fmt, > };
Hi Sakari, On Tue, Dec 03, 2019 at 10:56:04AM +0200, Sakari Ailus wrote: > On Sat, Nov 30, 2019 at 12:35:40AM +0530, Manivannan Sadhasivam wrote: > > Add support to enumerate all frame sizes supported by IMX290. This is > > required for using with userspace tools such as libcamera. > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > --- > > drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > > index d5bb3a59ac46..f26c4a0ee0a0 100644 > > --- a/drivers/media/i2c/imx290.c > > +++ b/drivers/media/i2c/imx290.c > > @@ -468,6 +468,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, > > return 0; > > } > > > > +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, > > + struct v4l2_subdev_pad_config *cfg, > > + struct v4l2_subdev_frame_size_enum *fse) > > +{ > > + if ((fse->code != imx290_formats[0].code) && > > + (fse->code != imx290_formats[1].code)) > > Please use a loop over imx290_formats instead. > May I know why? What benefit does it provide over current method? Thanks, Mani > > + return -EINVAL; > > + > > + if (fse->index >= ARRAY_SIZE(imx290_modes)) > > + return -EINVAL; > > + > > + fse->min_width = imx290_modes[fse->index].width; > > + fse->max_width = imx290_modes[fse->index].width; > > + fse->min_height = imx290_modes[fse->index].height; > > + fse->max_height = imx290_modes[fse->index].height; > > + > > + return 0; > > +} > > + > > static int imx290_get_fmt(struct v4l2_subdev *sd, > > struct v4l2_subdev_pad_config *cfg, > > struct v4l2_subdev_format *fmt) > > @@ -820,6 +839,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { > > static const struct v4l2_subdev_pad_ops imx290_pad_ops = { > > .init_cfg = imx290_entity_init_cfg, > > .enum_mbus_code = imx290_enum_mbus_code, > > + .enum_frame_size = imx290_enum_frame_size, > > .get_fmt = imx290_get_fmt, > > .set_fmt = imx290_set_fmt, > > }; > > -- > Regards, > > Sakari Ailus
On Sun, Dec 15, 2019 at 03:52:37PM -0800, karthik poduval wrote: > What if someone adds RAW8 or RAW14 formats in future the enum frame sizes > code doesn't have to be patched again if written using a loop on formats > array. > Please don't top post :) IMX290 only supports RAW10 and RAW12 formats. And I don't think this driver can handle any other CMOS sensors from Sony, so looping over imx290_formats seems unnecessary to me. Thanks, Mani > On Sun, Dec 15, 2019, 9:49 AM Manivannan Sadhasivam < > manivannan.sadhasivam@linaro.org> wrote: > > > Hi Sakari, > > > > On Tue, Dec 03, 2019 at 10:56:04AM +0200, Sakari Ailus wrote: > > > On Sat, Nov 30, 2019 at 12:35:40AM +0530, Manivannan Sadhasivam wrote: > > > > Add support to enumerate all frame sizes supported by IMX290. This is > > > > required for using with userspace tools such as libcamera. > > > > > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org > > > > > > > --- > > > > drivers/media/i2c/imx290.c | 20 ++++++++++++++++++++ > > > > 1 file changed, 20 insertions(+) > > > > > > > > diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c > > > > index d5bb3a59ac46..f26c4a0ee0a0 100644 > > > > --- a/drivers/media/i2c/imx290.c > > > > +++ b/drivers/media/i2c/imx290.c > > > > @@ -468,6 +468,25 @@ static int imx290_enum_mbus_code(struct > > v4l2_subdev *sd, > > > > return 0; > > > > } > > > > > > > > +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, > > > > + struct v4l2_subdev_pad_config *cfg, > > > > + struct v4l2_subdev_frame_size_enum *fse) > > > > +{ > > > > + if ((fse->code != imx290_formats[0].code) && > > > > + (fse->code != imx290_formats[1].code)) > > > > > > Please use a loop over imx290_formats instead. > > > > > > > May I know why? What benefit does it provide over current method? > > > > Thanks, > > Mani > > > > > > + return -EINVAL; > > > > + > > > > + if (fse->index >= ARRAY_SIZE(imx290_modes)) > > > > + return -EINVAL; > > > > + > > > > + fse->min_width = imx290_modes[fse->index].width; > > > > + fse->max_width = imx290_modes[fse->index].width; > > > > + fse->min_height = imx290_modes[fse->index].height; > > > > + fse->max_height = imx290_modes[fse->index].height; > > > > + > > > > + return 0; > > > > +} > > > > + > > > > static int imx290_get_fmt(struct v4l2_subdev *sd, > > > > struct v4l2_subdev_pad_config *cfg, > > > > struct v4l2_subdev_format *fmt) > > > > @@ -820,6 +839,7 @@ static const struct v4l2_subdev_video_ops > > imx290_video_ops = { > > > > static const struct v4l2_subdev_pad_ops imx290_pad_ops = { > > > > .init_cfg = imx290_entity_init_cfg, > > > > .enum_mbus_code = imx290_enum_mbus_code, > > > > + .enum_frame_size = imx290_enum_frame_size, > > > > .get_fmt = imx290_get_fmt, > > > > .set_fmt = imx290_set_fmt, > > > > }; > > > > > > -- > > > Regards, > > > > > > Sakari Ailus > >
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index d5bb3a59ac46..f26c4a0ee0a0 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -468,6 +468,25 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd, return 0; } +static int imx290_enum_frame_size(struct v4l2_subdev *subdev, + struct v4l2_subdev_pad_config *cfg, + struct v4l2_subdev_frame_size_enum *fse) +{ + if ((fse->code != imx290_formats[0].code) && + (fse->code != imx290_formats[1].code)) + return -EINVAL; + + if (fse->index >= ARRAY_SIZE(imx290_modes)) + return -EINVAL; + + fse->min_width = imx290_modes[fse->index].width; + fse->max_width = imx290_modes[fse->index].width; + fse->min_height = imx290_modes[fse->index].height; + fse->max_height = imx290_modes[fse->index].height; + + return 0; +} + static int imx290_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *fmt) @@ -820,6 +839,7 @@ static const struct v4l2_subdev_video_ops imx290_video_ops = { static const struct v4l2_subdev_pad_ops imx290_pad_ops = { .init_cfg = imx290_entity_init_cfg, .enum_mbus_code = imx290_enum_mbus_code, + .enum_frame_size = imx290_enum_frame_size, .get_fmt = imx290_get_fmt, .set_fmt = imx290_set_fmt, };