mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
88 lines
2.7 KiB
Diff
88 lines
2.7 KiB
Diff
From 913be9ccd4b3263c2d8b53affb000c1d7f06584b Mon Sep 17 00:00:00 2001
|
|
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Date: Sun, 16 Oct 2022 09:15:18 +0300
|
|
Subject: [PATCH 658/726] media: i2c: imx290: Implement HBLANK and VBLANK
|
|
controls
|
|
|
|
Upstream commit 0c3b56c905e3.
|
|
|
|
Add support for the V4L2_CID_HBLANK and V4L2_CID_VBLANK controls to the
|
|
imx290 driver. Make the controls read-only to start with, to report the
|
|
values to userspace for timing calculation.
|
|
|
|
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
|
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
---
|
|
drivers/media/i2c/imx290.c | 33 ++++++++++++++++++++++++++++++++-
|
|
1 file changed, 32 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
|
|
index 98ffafd631fa..d3acf5519789 100644
|
|
--- a/drivers/media/i2c/imx290.c
|
|
+++ b/drivers/media/i2c/imx290.c
|
|
@@ -146,6 +146,8 @@ struct imx290 {
|
|
struct v4l2_ctrl_handler ctrls;
|
|
struct v4l2_ctrl *link_freq;
|
|
struct v4l2_ctrl *pixel_rate;
|
|
+ struct v4l2_ctrl *hblank;
|
|
+ struct v4l2_ctrl *vblank;
|
|
|
|
struct mutex lock;
|
|
};
|
|
@@ -642,6 +644,20 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
|
|
if (imx290->pixel_rate)
|
|
__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
|
|
imx290_calc_pixel_rate(imx290));
|
|
+
|
|
+ if (imx290->hblank) {
|
|
+ unsigned int hblank = mode->hmax - mode->width;
|
|
+
|
|
+ __v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank,
|
|
+ 1, hblank);
|
|
+ }
|
|
+
|
|
+ if (imx290->vblank) {
|
|
+ unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
|
|
+
|
|
+ __v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank,
|
|
+ 1, vblank);
|
|
+ }
|
|
}
|
|
|
|
*format = fmt->format;
|
|
@@ -880,9 +896,10 @@ static const struct media_entity_operations imx290_subdev_entity_ops = {
|
|
|
|
static int imx290_ctrl_init(struct imx290 *imx290)
|
|
{
|
|
+ unsigned int blank;
|
|
int ret;
|
|
|
|
- v4l2_ctrl_handler_init(&imx290->ctrls, 5);
|
|
+ v4l2_ctrl_handler_init(&imx290->ctrls, 7);
|
|
imx290->ctrls.lock = &imx290->lock;
|
|
|
|
/*
|
|
@@ -923,6 +940,20 @@ static int imx290_ctrl_init(struct imx290 *imx290)
|
|
ARRAY_SIZE(imx290_test_pattern_menu) - 1,
|
|
0, 0, imx290_test_pattern_menu);
|
|
|
|
+ blank = imx290->current_mode->hmax - imx290->current_mode->width;
|
|
+ imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
|
|
+ V4L2_CID_HBLANK, blank, blank, 1,
|
|
+ blank);
|
|
+ if (imx290->hblank)
|
|
+ imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
+
|
|
+ blank = IMX290_VMAX_DEFAULT - imx290->current_mode->height;
|
|
+ imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
|
|
+ V4L2_CID_VBLANK, blank, blank, 1,
|
|
+ blank);
|
|
+ if (imx290->vblank)
|
|
+ imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
+
|
|
imx290->sd.ctrl_handler = &imx290->ctrls;
|
|
|
|
if (imx290->ctrls.error) {
|
|
--
|
|
2.33.1
|
|
|