public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Daniel Scally <djrscally@gmail.com>
To: djrscally@gmail.com, sakari.ailus@linux.intel.com,
	paul.kocialkowski@bootlin.com, ezequiel@collabora.com,
	hverkuil-cisco@xs4all.nl, linux-media@vger.kernel.org
Cc: yong.zhi@intel.com, bingbu.cao@intel.com, tian.shu.qiu@intel.com,
	kevin.lhopital@bootlin.com, yang.lee@linux.alibaba.com,
	andy.shevchenko@gmail.com, laurent.pinchart@ideasonboard.com,
	kieran.bingham@ideasonboard.com
Subject: [PATCH v2 05/12] media: i2c: Add .get_selection() support to ov8865
Date: Mon,  9 Aug 2021 23:58:38 +0100	[thread overview]
Message-ID: <20210809225845.916430-6-djrscally@gmail.com> (raw)
In-Reply-To: <20210809225845.916430-1-djrscally@gmail.com>

The ov8865 driver's v4l2_subdev_pad_ops currently does not include
.get_selection() - add support for that callback.

Signed-off-by: Daniel Scally <djrscally@gmail.com>
---
Changes in v2:

	- None

 drivers/media/i2c/ov8865.c | 61 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c
index 1382b16d1a09..8c2b7d3cbc8c 100644
--- a/drivers/media/i2c/ov8865.c
+++ b/drivers/media/i2c/ov8865.c
@@ -450,6 +450,15 @@
 #define OV8865_PRE_CTRL0_PATTERN_COLOR_SQUARES	2
 #define OV8865_PRE_CTRL0_PATTERN_BLACK		3
 
+/* Pixel Array */
+
+#define OV8865_NATIVE_WIDTH			3296
+#define OV8865_NATIVE_HEIGHT			2528
+#define OV8865_ACTIVE_START_TOP			32
+#define OV8865_ACTIVE_START_LEFT		80
+#define OV8865_ACTIVE_WIDTH			3264
+#define OV8865_ACTIVE_HEIGHT			2448
+
 /* Macros */
 
 #define ov8865_subdev_sensor(s) \
@@ -2749,12 +2758,64 @@ static int ov8865_enum_frame_interval(struct v4l2_subdev *subdev,
 	return 0;
 }
 
+static void
+__ov8865_get_pad_crop(struct ov8865_sensor *sensor,
+		      struct v4l2_subdev_state *state, unsigned int pad,
+		      enum v4l2_subdev_format_whence which, struct v4l2_rect *r)
+{
+	switch (which) {
+	case V4L2_SUBDEV_FORMAT_TRY:
+		*r = *v4l2_subdev_get_try_crop(&sensor->subdev, state, pad);
+		break;
+	case V4L2_SUBDEV_FORMAT_ACTIVE:
+		r->height = sensor->state.mode->output_size_y;
+		r->width = sensor->state.mode->output_size_x;
+		r->top = (OV8865_NATIVE_HEIGHT - sensor->state.mode->output_size_y) / 2;
+		r->left = (OV8865_NATIVE_WIDTH - sensor->state.mode->output_size_x) / 2;
+		break;
+	}
+}
+
+static int ov8865_get_selection(struct v4l2_subdev *subdev,
+				struct v4l2_subdev_state *state,
+				struct v4l2_subdev_selection *sel)
+{
+	struct ov8865_sensor *sensor = ov8865_subdev_sensor(subdev);
+
+	switch (sel->target) {
+	case V4L2_SEL_TGT_CROP:
+		mutex_lock(&sensor->mutex);
+			__ov8865_get_pad_crop(sensor, state, sel->pad,
+					      sel->which, &sel->r);
+		mutex_unlock(&sensor->mutex);
+		break;
+	case V4L2_SEL_TGT_NATIVE_SIZE:
+		sel->r.top = 0;
+		sel->r.left = 0;
+		sel->r.width = OV8865_NATIVE_WIDTH;
+		sel->r.height = OV8865_NATIVE_HEIGHT;
+		break;
+	case V4L2_SEL_TGT_CROP_BOUNDS:
+	case V4L2_SEL_TGT_CROP_DEFAULT:
+		sel->r.top = OV8865_ACTIVE_START_TOP;
+		sel->r.left = OV8865_ACTIVE_START_LEFT;
+		sel->r.width = OV8865_ACTIVE_WIDTH;
+		sel->r.height = OV8865_ACTIVE_HEIGHT;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 static const struct v4l2_subdev_pad_ops ov8865_subdev_pad_ops = {
 	.enum_mbus_code		= ov8865_enum_mbus_code,
 	.get_fmt		= ov8865_get_fmt,
 	.set_fmt		= ov8865_set_fmt,
 	.enum_frame_size	= ov8865_enum_frame_size,
 	.enum_frame_interval	= ov8865_enum_frame_interval,
+	.get_selection		= ov8865_get_selection,
 };
 
 static const struct v4l2_subdev_ops ov8865_subdev_ops = {
-- 
2.25.1


  parent reply	other threads:[~2021-08-09 22:59 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-09 22:58 [PATCH v2 00/12] Extensions to ov8865 driver Daniel Scally
2021-08-09 22:58 ` [PATCH v2 01/12] media: i2c: Add ACPI support to ov8865 Daniel Scally
2021-08-10 12:57   ` Andy Shevchenko
2021-08-09 22:58 ` [PATCH v2 02/12] media: i2c: Fix incorrect value in comment Daniel Scally
2021-08-09 22:58 ` [PATCH v2 03/12] media: i2c: Defer probe if not endpoint found Daniel Scally
2021-08-09 22:58 ` [PATCH v2 04/12] media: i2c: Support 19.2MHz input clock in ov8865 Daniel Scally
2021-08-10 13:04   ` Andy Shevchenko
2021-08-10 21:46     ` Daniel Scally
2021-08-10 13:34   ` Sakari Ailus
2021-08-10 21:37     ` Daniel Scally
2021-08-10 21:49       ` Sakari Ailus
2021-09-07 22:44         ` Daniel Scally
2021-09-08  6:52           ` Sakari Ailus
2021-08-09 22:58 ` Daniel Scally [this message]
2021-08-10 13:38   ` [PATCH v2 05/12] media: i2c: Add .get_selection() support to ov8865 Sakari Ailus
2021-08-24 23:17     ` Daniel Scally
2021-08-25  7:16       ` Sakari Ailus
2021-08-25  8:04         ` Laurent Pinchart
2021-08-25  8:29           ` Sakari Ailus
2021-08-09 22:58 ` [PATCH v2 06/12] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN Daniel Scally
2021-08-10 13:48   ` Sakari Ailus
2021-08-09 22:58 ` [PATCH v2 07/12] media: i2c: Add vblank control to ov8865 Daniel Scally
2021-08-09 22:58 ` [PATCH v2 08/12] media: i2c: Add hblank " Daniel Scally
2021-08-10 13:10   ` Andy Shevchenko
2021-08-10 14:29   ` Sakari Ailus
2021-08-10 22:07     ` Daniel Scally
2021-08-13  3:05       ` Laurent Pinchart
2021-08-13  9:45         ` Daniel Scally
2021-08-14 20:56           ` Laurent Pinchart
2021-09-09 22:36             ` Daniel Scally
2021-10-09 23:10               ` Daniel Scally
2021-08-09 22:58 ` [PATCH v2 09/12] media: i2c: cap exposure at height + vblank in ov8865 Daniel Scally
2021-08-10 14:30   ` Sakari Ailus
2021-08-09 22:58 ` [PATCH v2 10/12] media: i2c: Add controls from fwnode to ov8865 Daniel Scally
2021-08-09 22:58 ` [PATCH v2 11/12] media: i2c: Switch exposure control unit to lines Daniel Scally
2021-08-09 22:58 ` [PATCH v2 12/12] media: ipu3-cio2: Add INT347A to cio2-bridge Daniel Scally
2021-08-10 13:12   ` Andy Shevchenko

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=20210809225845.916430-6-djrscally@gmail.com \
    --to=djrscally@gmail.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=bingbu.cao@intel.com \
    --cc=ezequiel@collabora.com \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=kevin.lhopital@bootlin.com \
    --cc=kieran.bingham@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=paul.kocialkowski@bootlin.com \
    --cc=sakari.ailus@linux.intel.com \
    --cc=tian.shu.qiu@intel.com \
    --cc=yang.lee@linux.alibaba.com \
    --cc=yong.zhi@intel.com \
    /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