From: Daniel Scally <djrscally@gmail.com>
To: linux-media@vger.kernel.org
Cc: yong.zhi@intel.com, sakari.ailus@linux.intel.com,
bingbu.cao@intel.com, tian.shu.qiu@intel.com,
andriy.shevchenko@linux.intel.com, hverkuil-cisco@xs4all.nl
Subject: [PATCH v4 12/15] media: i2c: Extend .get_selection() for ov7251
Date: Fri, 6 May 2022 00:03:59 +0100 [thread overview]
Message-ID: <20220505230402.449643-13-djrscally@gmail.com> (raw)
In-Reply-To: <20220505230402.449643-1-djrscally@gmail.com>
Extend the .get_selection() callback to support other values for
sel->target, primarily to satisfy libcamera's requirements.
Signed-off-by: Daniel Scally <djrscally@gmail.com>
---
Changes in v4:
- None
Changes in v3:
- New patch
drivers/media/i2c/ov7251.c | 35 +++++++++++++++++++++++++++++------
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
index a1326d03bcdd..54c883753207 100644
--- a/drivers/media/i2c/ov7251.c
+++ b/drivers/media/i2c/ov7251.c
@@ -54,6 +54,13 @@
#define OV7251_PLL2_SYS_DIV_REG 0x309a
#define OV7251_PLL2_ADC_DIV_REG 0x309b
+#define OV7251_NATIVE_WIDTH 656
+#define OV7251_NATIVE_HEIGHT 496
+#define OV7251_ACTIVE_START_LEFT 4
+#define OV7251_ACTIVE_START_TOP 4
+#define OV7251_ACTIVE_WIDTH 648
+#define OV7251_ACTIVE_HEIGHT 488
+
struct reg_value {
u16 reg;
u8 val;
@@ -1248,13 +1255,29 @@ static int ov7251_get_selection(struct v4l2_subdev *sd,
{
struct ov7251 *ov7251 = to_ov7251(sd);
- if (sel->target != V4L2_SEL_TGT_CROP)
- return -EINVAL;
-
+ switch (sel->target) {
+ case V4L2_SEL_TGT_CROP_DEFAULT:
+ case V4L2_SEL_TGT_CROP:
mutex_lock(&ov7251->lock);
- sel->r = *__ov7251_get_pad_crop(ov7251, sd_state, sel->pad,
- sel->which);
- mutex_unlock(&ov7251->lock);
+ sel->r = *__ov7251_get_pad_crop(ov7251, sd_state, sel->pad,
+ sel->which);
+ mutex_unlock(&ov7251->lock);
+ break;
+ case V4L2_SEL_TGT_NATIVE_SIZE:
+ sel->r.top = 0;
+ sel->r.left = 0;
+ sel->r.width = OV7251_NATIVE_WIDTH;
+ sel->r.height = OV7251_NATIVE_HEIGHT;
+ break;
+ case V4L2_SEL_TGT_CROP_BOUNDS:
+ sel->r.top = OV7251_ACTIVE_START_TOP;
+ sel->r.left = OV7251_ACTIVE_START_LEFT;
+ sel->r.width = OV7251_ACTIVE_WIDTH;
+ sel->r.height = OV7251_ACTIVE_HEIGHT;
+ break;
+ default:
+ return -EINVAL;
+ }
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2022-05-05 23:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 23:03 [PATCH v4 00/15] Support OVTI7251 on Microsoft Surface line Daniel Scally
2022-05-05 23:03 ` [PATCH v4 01/15] media: uapi: Add IPU3 packed Y10 format Daniel Scally
2022-05-05 23:03 ` [PATCH v4 02/15] media: ipu3-cio2: Add support for V4L2_PIX_FMT_IPU3_Y10 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 03/15] media: i2c: Add acpi support to ov7251 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 04/15] media: i2c: Provide ov7251_check_hwcfg() Daniel Scally
2022-05-05 23:03 ` [PATCH v4 05/15] media: i2c: Remove per-mode frequencies from ov7251 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 06/15] media: i2c: Add ov7251_pll_configure() Daniel Scally
2022-05-05 23:03 ` [PATCH v4 07/15] media: i2c: Add support for new frequencies to ov7251 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 08/15] media: i2c: Add ov7251_detect_chip() Daniel Scally
2022-05-05 23:03 ` [PATCH v4 09/15] media: i2c: Add pm_runtime support to ov7251 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 10/15] media: i2c: Remove .s_power() from ov7251 Daniel Scally
2022-05-05 23:03 ` [PATCH v4 11/15] media: ipu3-cio2: Add INT347E to cio2-bridge Daniel Scally
2022-05-05 23:03 ` Daniel Scally [this message]
2022-05-05 23:04 ` [PATCH v4 13/15] media: i2c: add ov7251_init_ctrls() Daniel Scally
2022-05-05 23:04 ` [PATCH v4 14/15] media: i2c: Add hblank control to ov7251 Daniel Scally
2022-05-05 23:04 ` [PATCH v4 15/15] media: i2c: Add vblank control to ov7251 driver Daniel Scally
2022-05-06 22:37 ` [PATCH v4 00/15] Support OVTI7251 on Microsoft Surface line Andy Shevchenko
2022-05-06 22:45 ` Daniel Scally
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=20220505230402.449643-13-djrscally@gmail.com \
--to=djrscally@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bingbu.cao@intel.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tian.shu.qiu@intel.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