diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0676-media-i2c-imx219-Implement-get_selection.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0676-media-i2c-imx219-Implement-get_selection.patch | 181 |
1 files changed, 181 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0676-media-i2c-imx219-Implement-get_selection.patch b/target/linux/bcm27xx/patches-5.4/950-0676-media-i2c-imx219-Implement-get_selection.patch new file mode 100644 index 0000000000..cb7a0af605 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0676-media-i2c-imx219-Implement-get_selection.patch @@ -0,0 +1,181 @@ +From f479cf37ccda2be7204a964fe2747dfcb4b56bf6 Mon Sep 17 00:00:00 2001 +From: Jacopo Mondi <jacopo@jmondi.org> +Date: Wed, 29 Apr 2020 11:50:38 +0200 +Subject: [PATCH] media: i2c: imx219: Implement get_selection + +Implement the get_selection pad operation for the IMX219 sensor driver. +The supported targets report the sensor's native size, the crop default +rectangle and the crop rectangle. + +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +Signed-off-by: Jacopo Mondi <jacopo@jmondi.org> +--- + drivers/media/i2c/imx219.c | 94 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 94 insertions(+) + +--- a/drivers/media/i2c/imx219.c ++++ b/drivers/media/i2c/imx219.c +@@ -122,6 +122,14 @@ enum pad_types { + NUM_PADS + }; + ++/* IMX219 native and active pixel array size. */ ++#define IMX219_NATIVE_WIDTH 3296U ++#define IMX219_NATIVE_HEIGHT 2480U ++#define IMX219_PIXEL_ARRAY_LEFT 8U ++#define IMX219_PIXEL_ARRAY_TOP 8U ++#define IMX219_PIXEL_ARRAY_WIDTH 3280U ++#define IMX219_PIXEL_ARRAY_HEIGHT 2464U ++ + struct imx219_reg { + u16 address; + u8 val; +@@ -139,6 +147,9 @@ struct imx219_mode { + /* Frame height */ + unsigned int height; + ++ /* Analog crop rectangle. */ ++ struct v4l2_rect crop; ++ + /* V-timing */ + unsigned int vts_def; + +@@ -473,6 +484,12 @@ static const struct imx219_mode supporte + /* 8MPix 15fps mode */ + .width = 3280, + .height = 2464, ++ .crop = { ++ .left = 0, ++ .top = 0, ++ .width = 3280, ++ .height = 2464 ++ }, + .vts_def = IMX219_VTS_15FPS, + .reg_list = { + .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs), +@@ -483,6 +500,12 @@ static const struct imx219_mode supporte + /* 1080P 30fps cropped */ + .width = 1920, + .height = 1080, ++ .crop = { ++ .left = 680, ++ .top = 692, ++ .width = 1920, ++ .height = 1080 ++ }, + .vts_def = IMX219_VTS_30FPS_1080P, + .reg_list = { + .num_of_regs = ARRAY_SIZE(mode_1920_1080_regs), +@@ -493,6 +516,12 @@ static const struct imx219_mode supporte + /* 2x2 binned 30fps mode */ + .width = 1640, + .height = 1232, ++ .crop = { ++ .left = 0, ++ .top = 0, ++ .width = 3280, ++ .height = 2464 ++ }, + .vts_def = IMX219_VTS_30FPS_BINNED, + .reg_list = { + .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs), +@@ -503,6 +532,12 @@ static const struct imx219_mode supporte + /* 640x480 30fps mode */ + .width = 640, + .height = 480, ++ .crop = { ++ .left = 1000, ++ .top = 752, ++ .width = 1280, ++ .height = 960 ++ }, + .vts_def = IMX219_VTS_30FPS_640x480, + .reg_list = { + .num_of_regs = ARRAY_SIZE(mode_640_480_regs), +@@ -666,6 +701,7 @@ static int imx219_open(struct v4l2_subde + v4l2_subdev_get_try_format(sd, fh->pad, IMAGE_PAD); + struct v4l2_mbus_framefmt *try_fmt_meta = + v4l2_subdev_get_try_format(sd, fh->pad, METADATA_PAD); ++ struct v4l2_rect *try_crop; + + mutex_lock(&imx219->mutex); + +@@ -682,6 +718,13 @@ static int imx219_open(struct v4l2_subde + try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA; + try_fmt_meta->field = V4L2_FIELD_NONE; + ++ /* Initialize try_crop rectangle. */ ++ try_crop = v4l2_subdev_get_try_crop(sd, fh->pad, 0); ++ try_crop->top = IMX219_PIXEL_ARRAY_TOP; ++ try_crop->left = IMX219_PIXEL_ARRAY_LEFT; ++ try_crop->width = IMX219_PIXEL_ARRAY_WIDTH; ++ try_crop->height = IMX219_PIXEL_ARRAY_HEIGHT; ++ + mutex_unlock(&imx219->mutex); + + return 0; +@@ -1011,6 +1054,56 @@ static int imx219_set_framefmt(struct im + return -EINVAL; + } + ++static const struct v4l2_rect * ++__imx219_get_pad_crop(struct imx219 *imx219, struct v4l2_subdev_pad_config *cfg, ++ unsigned int pad, enum v4l2_subdev_format_whence which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(&imx219->sd, cfg, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &imx219->mode->crop; ++ } ++ ++ return NULL; ++} ++ ++static int imx219_get_selection(struct v4l2_subdev *sd, ++ struct v4l2_subdev_pad_config *cfg, ++ struct v4l2_subdev_selection *sel) ++{ ++ switch (sel->target) { ++ case V4L2_SEL_TGT_CROP: { ++ struct imx219 *imx219 = to_imx219(sd); ++ ++ mutex_lock(&imx219->mutex); ++ sel->r = *__imx219_get_pad_crop(imx219, cfg, sel->pad, ++ sel->which); ++ mutex_unlock(&imx219->mutex); ++ ++ return 0; ++ } ++ ++ case V4L2_SEL_TGT_NATIVE_SIZE: ++ sel->r.top = 0; ++ sel->r.left = 0; ++ sel->r.width = IMX219_NATIVE_WIDTH; ++ sel->r.height = IMX219_NATIVE_HEIGHT; ++ ++ return 0; ++ ++ case V4L2_SEL_TGT_CROP_DEFAULT: ++ sel->r.top = IMX219_PIXEL_ARRAY_TOP; ++ sel->r.left = IMX219_PIXEL_ARRAY_LEFT; ++ sel->r.width = IMX219_PIXEL_ARRAY_WIDTH; ++ sel->r.height = IMX219_PIXEL_ARRAY_HEIGHT; ++ ++ return 0; ++ } ++ ++ return -EINVAL; ++} ++ + static int imx219_start_streaming(struct imx219 *imx219) + { + struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); +@@ -1235,6 +1328,7 @@ static const struct v4l2_subdev_pad_ops + .enum_mbus_code = imx219_enum_mbus_code, + .get_fmt = imx219_get_pad_format, + .set_fmt = imx219_set_pad_format, ++ .get_selection = imx219_get_selection, + .enum_frame_size = imx219_enum_frame_size, + }; + |