Commit e6d4ef7d authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 35dd70b4
...@@ -112,6 +112,14 @@ ...@@ -112,6 +112,14 @@
#define IMX219_TESTP_BLUE_DEFAULT 0 #define IMX219_TESTP_BLUE_DEFAULT 0
#define IMX219_TESTP_GREENB_DEFAULT 0 #define IMX219_TESTP_GREENB_DEFAULT 0
/* 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 { struct imx219_reg {
u16 address; u16 address;
u8 val; u8 val;
...@@ -129,6 +137,9 @@ struct imx219_mode { ...@@ -129,6 +137,9 @@ struct imx219_mode {
/* Frame height */ /* Frame height */
unsigned int height; unsigned int height;
/* Analog crop rectangle. */
struct v4l2_rect crop;
/* V-timing */ /* V-timing */
unsigned int vts_def; unsigned int vts_def;
...@@ -463,6 +474,12 @@ static const struct imx219_mode supported_modes[] = { ...@@ -463,6 +474,12 @@ static const struct imx219_mode supported_modes[] = {
/* 8MPix 15fps mode */ /* 8MPix 15fps mode */
.width = 3280, .width = 3280,
.height = 2464, .height = 2464,
.crop = {
.left = 0,
.top = 0,
.width = 3280,
.height = 2464
},
.vts_def = IMX219_VTS_15FPS, .vts_def = IMX219_VTS_15FPS,
.reg_list = { .reg_list = {
.num_of_regs = ARRAY_SIZE(mode_3280x2464_regs), .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs),
...@@ -473,6 +490,12 @@ static const struct imx219_mode supported_modes[] = { ...@@ -473,6 +490,12 @@ static const struct imx219_mode supported_modes[] = {
/* 1080P 30fps cropped */ /* 1080P 30fps cropped */
.width = 1920, .width = 1920,
.height = 1080, .height = 1080,
.crop = {
.left = 680,
.top = 692,
.width = 1920,
.height = 1080
},
.vts_def = IMX219_VTS_30FPS_1080P, .vts_def = IMX219_VTS_30FPS_1080P,
.reg_list = { .reg_list = {
.num_of_regs = ARRAY_SIZE(mode_1920_1080_regs), .num_of_regs = ARRAY_SIZE(mode_1920_1080_regs),
...@@ -483,6 +506,12 @@ static const struct imx219_mode supported_modes[] = { ...@@ -483,6 +506,12 @@ static const struct imx219_mode supported_modes[] = {
/* 2x2 binned 30fps mode */ /* 2x2 binned 30fps mode */
.width = 1640, .width = 1640,
.height = 1232, .height = 1232,
.crop = {
.left = 0,
.top = 0,
.width = 3280,
.height = 2464
},
.vts_def = IMX219_VTS_30FPS_BINNED, .vts_def = IMX219_VTS_30FPS_BINNED,
.reg_list = { .reg_list = {
.num_of_regs = ARRAY_SIZE(mode_1640_1232_regs), .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs),
...@@ -493,6 +522,12 @@ static const struct imx219_mode supported_modes[] = { ...@@ -493,6 +522,12 @@ static const struct imx219_mode supported_modes[] = {
/* 640x480 30fps mode */ /* 640x480 30fps mode */
.width = 640, .width = 640,
.height = 480, .height = 480,
.crop = {
.left = 1000,
.top = 752,
.width = 1280,
.height = 960
},
.vts_def = IMX219_VTS_30FPS_640x480, .vts_def = IMX219_VTS_30FPS_640x480,
.reg_list = { .reg_list = {
.num_of_regs = ARRAY_SIZE(mode_640_480_regs), .num_of_regs = ARRAY_SIZE(mode_640_480_regs),
...@@ -654,6 +689,7 @@ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ...@@ -654,6 +689,7 @@ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
struct imx219 *imx219 = to_imx219(sd); struct imx219 *imx219 = to_imx219(sd);
struct v4l2_mbus_framefmt *try_fmt = struct v4l2_mbus_framefmt *try_fmt =
v4l2_subdev_get_try_format(sd, fh->pad, 0); v4l2_subdev_get_try_format(sd, fh->pad, 0);
struct v4l2_rect *try_crop;
mutex_lock(&imx219->mutex); mutex_lock(&imx219->mutex);
...@@ -664,6 +700,13 @@ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ...@@ -664,6 +700,13 @@ static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
MEDIA_BUS_FMT_SRGGB10_1X10); MEDIA_BUS_FMT_SRGGB10_1X10);
try_fmt->field = V4L2_FIELD_NONE; try_fmt->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); mutex_unlock(&imx219->mutex);
return 0; return 0;
...@@ -928,6 +971,56 @@ static int imx219_set_framefmt(struct imx219 *imx219) ...@@ -928,6 +971,56 @@ static int imx219_set_framefmt(struct imx219 *imx219)
return -EINVAL; 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) static int imx219_start_streaming(struct imx219 *imx219)
{ {
struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
...@@ -1152,6 +1245,7 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = { ...@@ -1152,6 +1245,7 @@ static const struct v4l2_subdev_pad_ops imx219_pad_ops = {
.enum_mbus_code = imx219_enum_mbus_code, .enum_mbus_code = imx219_enum_mbus_code,
.get_fmt = imx219_get_pad_format, .get_fmt = imx219_get_pad_format,
.set_fmt = imx219_set_pad_format, .set_fmt = imx219_set_pad_format,
.get_selection = imx219_get_selection,
.enum_frame_size = imx219_enum_frame_size, .enum_frame_size = imx219_enum_frame_size,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment