Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: i2c: imx219: Calculate crop rectangle dynamically

Browse Source 
Calculate the crop rectangle size and location dynamically when setting
the format, instead of storing it in the imx219_mode structure. This
removes duplicated information from the mode, to guarantee consistency.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Laurent Pinchart 2023-09-24 18:33:07 +03:00 committed by Hans Verkuil
parent 186aa9d472
commit 0af46fbc33
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/media/i2c/imx219.c
View File

@ -18,6 +18,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/minmax.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
@ -153,9 +154,6 @@ 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;
}; };
@ -292,48 +290,24 @@ static const struct imx219_mode supported_modes[] = {
/* 8MPix 15fps mode */ /* 8MPix 15fps mode */
.width = 3280, .width = 3280,
.height = 2464, .height = 2464,
.crop = {
.left = IMX219_PIXEL_ARRAY_LEFT,
.top = IMX219_PIXEL_ARRAY_TOP,
.width = 3280,
.height = 2464
},
.vts_def = 3526, .vts_def = 3526,
}, },
{ {
/* 1080P 30fps cropped */ /* 1080P 30fps cropped */
.width = 1920, .width = 1920,
.height = 1080, .height = 1080,
.crop = {
.left = 688,
.top = 700,
.width = 1920,
.height = 1080
},
.vts_def = 1763, .vts_def = 1763,
}, },
{ {
/* 2x2 binned 30fps mode */ /* 2x2 binned 30fps mode */
.width = 1640, .width = 1640,
.height = 1232, .height = 1232,
.crop = {
.left = IMX219_PIXEL_ARRAY_LEFT,
.top = IMX219_PIXEL_ARRAY_TOP,
.width = 3280,
.height = 2464
},
.vts_def = 1763, .vts_def = 1763,
}, },
{ {
/* 640x480 30fps mode */ /* 640x480 30fps mode */
.width = 640, .width = 640,
.height = 480, .height = 480,
.crop = {
.left = 1008,
.top = 760,
.width = 1280,
.height = 960
},
.vts_def = 1763, .vts_def = 1763,
}, },
}; };
@ -844,6 +818,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
int exposure_max, exposure_def, hblank; int exposure_max, exposure_def, hblank;
struct v4l2_mbus_framefmt *format; struct v4l2_mbus_framefmt *format;
struct v4l2_rect *crop; struct v4l2_rect *crop;
unsigned int bin_h, bin_v;
mode = v4l2_find_nearest_size(supported_modes, mode = v4l2_find_nearest_size(supported_modes,
ARRAY_SIZE(supported_modes), ARRAY_SIZE(supported_modes),
@ -853,10 +828,20 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,
imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code); imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code);
format = v4l2_subdev_get_pad_format(sd, sd_state, 0); format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
*format = fmt->format; *format = fmt->format;
*crop = mode->crop;
/*
* Use binning to maximize the crop rectangle size, and centre it in the
* sensor.
*/
bin_h = min(IMX219_PIXEL_ARRAY_WIDTH / format->width, 2U);
bin_v = min(IMX219_PIXEL_ARRAY_HEIGHT / format->height, 2U);
crop = v4l2_subdev_get_pad_crop(sd, sd_state, 0);
crop->width = format->width * bin_h;
crop->height = format->height * bin_v;
crop->left = (IMX219_NATIVE_WIDTH - crop->width) / 2;
crop->top = (IMX219_NATIVE_HEIGHT - crop->height) / 2;
if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
/* Update limits and set FPS to default */ /* Update limits and set FPS to default */