devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: git@luigi311.com
To: linux-media@vger.kernel.org
Cc: dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com,
	mchehab@kernel.org, robh@kernel.org,
	krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
	shawnguo@kernel.org, s.hauer@pengutronix.de,
	kernel@pengutronix.de, festevam@gmail.com,
	sakari.ailus@linux.intel.com, devicetree@vger.kernel.org,
	imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, pavel@ucw.cz,
	phone-devel@vger.kernel.org, Luis Garcia <git@luigi311.com>
Subject: [PATCH v4 11/25] media: i2c: imx258: Add get_selection for pixel array information
Date: Sun, 14 Apr 2024 14:34:49 -0600	[thread overview]
Message-ID: <20240414203503.18402-12-git@luigi311.com> (raw)
In-Reply-To: <20240414203503.18402-1-git@luigi311.com>

From: Dave Stevenson <dave.stevenson@raspberrypi.com>

Libcamera requires the cropping information for each mode, so
add this information to the driver.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Luis Garcia <git@luigi311.com>
---
 drivers/media/i2c/imx258.c | 90 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
index ebc404b548b3..59a78a4cfe44 100644
--- a/drivers/media/i2c/imx258.c
+++ b/drivers/media/i2c/imx258.c
@@ -77,6 +77,14 @@
 #define REG_CONFIG_MIRROR_FLIP		0x03
 #define REG_CONFIG_FLIP_TEST_PATTERN	0x02
 
+/* IMX258 native and active pixel array size. */
+#define IMX258_NATIVE_WIDTH		4224U
+#define IMX258_NATIVE_HEIGHT		3192U
+#define IMX258_PIXEL_ARRAY_LEFT		8U
+#define IMX258_PIXEL_ARRAY_TOP		16U
+#define IMX258_PIXEL_ARRAY_WIDTH	4208U
+#define IMX258_PIXEL_ARRAY_HEIGHT	3120U
+
 struct imx258_reg {
 	u16 address;
 	u8 val;
@@ -116,6 +124,9 @@ struct imx258_mode {
 	u32 link_freq_index;
 	/* Default register values */
 	struct imx258_reg_list reg_list;
+
+	/* Analog crop rectangle */
+	struct v4l2_rect crop;
 };
 
 /*
@@ -560,6 +571,12 @@ static const struct imx258_mode supported_modes[] = {
 			.regs = mode_4208x3120_regs,
 		},
 		.link_freq_index = IMX258_LINK_FREQ_1267MBPS,
+		.crop = {
+			.left = IMX258_PIXEL_ARRAY_LEFT,
+			.top = IMX258_PIXEL_ARRAY_TOP,
+			.width = 4208,
+			.height = 3120,
+		},
 	},
 	{
 		.width = 2104,
@@ -571,6 +588,12 @@ static const struct imx258_mode supported_modes[] = {
 			.regs = mode_2104_1560_regs,
 		},
 		.link_freq_index = IMX258_LINK_FREQ_640MBPS,
+		.crop = {
+			.left = IMX258_PIXEL_ARRAY_LEFT,
+			.top = IMX258_PIXEL_ARRAY_TOP,
+			.width = 4208,
+			.height = 3120,
+		},
 	},
 	{
 		.width = 1048,
@@ -582,6 +605,12 @@ static const struct imx258_mode supported_modes[] = {
 			.regs = mode_1048_780_regs,
 		},
 		.link_freq_index = IMX258_LINK_FREQ_640MBPS,
+		.crop = {
+			.left = IMX258_PIXEL_ARRAY_LEFT,
+			.top = IMX258_PIXEL_ARRAY_TOP,
+			.width = 4208,
+			.height = 3120,
+		},
 	},
 };
 
@@ -698,6 +727,7 @@ static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
 	struct v4l2_mbus_framefmt *try_fmt =
 		v4l2_subdev_state_get_format(fh->state, 0);
+	struct v4l2_rect *try_crop;
 
 	/* Initialize try_fmt */
 	try_fmt->width = supported_modes[0].width;
@@ -705,6 +735,13 @@ static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 	try_fmt->code = MEDIA_BUS_FMT_SBGGR10_1X10;
 	try_fmt->field = V4L2_FIELD_NONE;
 
+	/* Initialize try_crop */
+	try_crop = v4l2_subdev_state_get_crop(fh->state, 0);
+	try_crop->left = IMX258_PIXEL_ARRAY_LEFT;
+	try_crop->top = IMX258_PIXEL_ARRAY_TOP;
+	try_crop->width = IMX258_PIXEL_ARRAY_WIDTH;
+	try_crop->height = IMX258_PIXEL_ARRAY_HEIGHT;
+
 	return 0;
 }
 
@@ -952,6 +989,58 @@ static int imx258_set_pad_format(struct v4l2_subdev *sd,
 	return 0;
 }
 
+static const struct v4l2_rect *
+__imx258_get_pad_crop(struct imx258 *imx258,
+		      struct v4l2_subdev_state *sd_state,
+		      unsigned int pad, enum v4l2_subdev_format_whence which)
+{
+	switch (which) {
+	case V4L2_SUBDEV_FORMAT_TRY:
+		return v4l2_subdev_state_get_crop(sd_state, pad);
+	case V4L2_SUBDEV_FORMAT_ACTIVE:
+		return &imx258->cur_mode->crop;
+	}
+
+	return NULL;
+}
+
+static int imx258_get_selection(struct v4l2_subdev *sd,
+				struct v4l2_subdev_state *sd_state,
+				struct v4l2_subdev_selection *sel)
+{
+	switch (sel->target) {
+	case V4L2_SEL_TGT_CROP: {
+		struct imx258 *imx258 = to_imx258(sd);
+
+		mutex_lock(&imx258->mutex);
+		sel->r = *__imx258_get_pad_crop(imx258, sd_state, sel->pad,
+						sel->which);
+		mutex_unlock(&imx258->mutex);
+
+		return 0;
+	}
+
+	case V4L2_SEL_TGT_NATIVE_SIZE:
+		sel->r.left = 0;
+		sel->r.top = 0;
+		sel->r.width = IMX258_NATIVE_WIDTH;
+		sel->r.height = IMX258_NATIVE_HEIGHT;
+
+		return 0;
+
+	case V4L2_SEL_TGT_CROP_DEFAULT:
+	case V4L2_SEL_TGT_CROP_BOUNDS:
+		sel->r.left = IMX258_PIXEL_ARRAY_LEFT;
+		sel->r.top = IMX258_PIXEL_ARRAY_TOP;
+		sel->r.width = IMX258_PIXEL_ARRAY_WIDTH;
+		sel->r.height = IMX258_PIXEL_ARRAY_HEIGHT;
+
+		return 0;
+	}
+
+	return -EINVAL;
+}
+
 /* Start streaming */
 static int imx258_start_streaming(struct imx258 *imx258)
 {
@@ -1128,6 +1217,7 @@ static const struct v4l2_subdev_pad_ops imx258_pad_ops = {
 	.get_fmt = imx258_get_pad_format,
 	.set_fmt = imx258_set_pad_format,
 	.enum_frame_size = imx258_enum_frame_size,
+	.get_selection = imx258_get_selection,
 };
 
 static const struct v4l2_subdev_ops imx258_subdev_ops = {
-- 
2.44.0


  parent reply	other threads:[~2024-04-14 20:41 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-14 20:34 [PATCH v4 00/25] imx258 improvement series git
2024-04-14 20:34 ` [PATCH v4 01/25] media: i2c: imx258: Remove unused defines git
2024-04-14 20:34 ` [PATCH v4 02/25] media: i2c: imx258: Make image geometry meet sensor requirements git
2024-04-15  6:25   ` Alexander Stein
2024-04-15 16:38     ` Luis Garcia
2024-04-16 15:18     ` Dave Stevenson
2024-04-14 20:34 ` [PATCH v4 03/25] media: i2c: imx258: Disable digital cropping on binned modes git
2024-04-14 20:34 ` [PATCH v4 04/25] media: i2c: imx258: Remove redundant I2C writes git
2024-04-14 20:34 ` [PATCH v4 05/25] media: i2c: imx258: Add regulator control git
2024-04-14 20:34 ` [PATCH v4 06/25] media: i2c: imx258: Make V4L2_CID_VBLANK configurable git
2024-04-14 20:34 ` [PATCH v4 07/25] media: i2c: imx258: Split out common registers from the mode based ones git
2024-04-14 20:34 ` [PATCH v4 08/25] media: i2c: imx258: Add support for 24MHz clock git
2024-04-14 20:34 ` [PATCH v4 09/25] media: i2c: imx258: Add support for running on 2 CSI data lanes git
2024-04-14 20:34 ` [PATCH v4 10/25] media: i2c: imx258: Follow normal V4L2 behaviours for clipping exposure git
2024-04-14 20:34 ` git [this message]
2024-04-14 20:34 ` [PATCH v4 12/25] media: i2c: imx258: Allow configuration of clock lane behaviour git
2024-04-14 20:34 ` [PATCH v4 13/25] media: i2c: imx258: Correct max FRM_LENGTH_LINES value git
2024-04-14 20:34 ` [PATCH v4 14/25] media: i2c: imx258: Issue reset before starting streaming git
2024-04-14 20:34 ` [PATCH v4 15/25] media: i2c: imx258: Set pixel_rate range to the same as the value git
2024-04-14 20:34 ` [PATCH v4 16/25] media: i2c: imx258: Support faster pixel rate on binned modes git
2024-04-14 20:34 ` [PATCH v4 17/25] dt-bindings: media: imx258: Rename to include vendor prefix git
2024-04-14 20:34 ` [PATCH v4 18/25] dt-bindings: media: imx258: Add alternate compatible strings git
2024-04-14 20:34 ` [PATCH v4 19/25] media: i2c: imx258: Change register settings for variants of the sensor git
2024-04-14 20:34 ` [PATCH v4 20/25] media: i2c: imx258: Make HFLIP and VFLIP controls writable git
2024-04-14 20:34 ` [PATCH v4 21/25] dt-bindings: media: imx258: Add binding for powerdown-gpio git
2024-04-14 20:35 ` [PATCH v4 22/25] media: i2c: imx258: Add support for powerdown gpio git
2024-04-14 20:35 ` [PATCH v4 23/25] media: i2c: imx258: Add support for reset gpio git
2024-04-15 16:00   ` Tommaso Merciai
2024-04-15 16:25     ` Luis Garcia
2024-04-14 20:35 ` [PATCH v4 24/25] media:i2c: imx258: Use v4l2_link_freq_to_bitmap helper git
2024-04-15 15:18   ` Tommaso Merciai
2024-04-15 16:27     ` Luis Garcia
2024-04-15 16:32       ` Tommaso Merciai
2024-04-14 20:35 ` [PATCH v4 25/25] media: i2c: imx258: Convert to new CCI register access helpers git
2024-04-15 14:47   ` Tommaso Merciai
2024-04-15 15:29     ` Luis Garcia

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240414203503.18402-12-git@luigi311.com \
    --to=git@luigi311.com \
    --cc=conor+dt@kernel.org \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=imx@lists.linux.dev \
    --cc=jacopo.mondi@ideasonboard.com \
    --cc=kernel@pengutronix.de \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=pavel@ucw.cz \
    --cc=phone-devel@vger.kernel.org \
    --cc=robh@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=sakari.ailus@linux.intel.com \
    --cc=shawnguo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).