FAILED: patch "[PATCH] media: imx219: Fix maximum frame length in lines" failed to apply to 6.6-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 2c4f1ba7354312ad2d6e34e70a518a51a9344715
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072955-retouch-favorably-ee17@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2c4f1ba7354312ad2d6e34e70a518a51a9344715 Mon Sep 17 00:00:00 2001
From: Sakari Ailus <[email protected]>
Date: Sat, 21 Feb 2026 01:38:15 +0200
Subject: [PATCH] media: imx219: Fix maximum frame length in lines
The driver used the maximum frame length in lines value of 0xffff, but the maximum appears to be 0xfffe instead. Fix it.
drivers/media/i2c/imx219.c +1 -1
@@ -72,7 +72,7 @@/* V_TIMING internal */ #define IMX219_REG_FRM_LENGTH_A CCI_REG16(0x0160) -#define IMX219_FLL_MAX 0xffff +#define IMX219_FLL_MAX 0xfffe#define IMX219_VBLANK_MIN 32#define IMX219_REG_LINE_LENGTH_A CCI_REG16(0x0162)#define IMX219_LLP_MIN 0x0d78
Sasha Levin
maintainerPATCH 1/7 media: i2c: imx219: Access height from active format in imx219_set_ctrl
From: Laurent Pinchart <[email protected]>
[ Upstream commit aa86ac42eec4dd7e987c12390a0a487187e2d9ae ]
Use the active format height instead of the mode height in imx219_set_ctrl(). This prepares for dropping the mode field from the imx219 structure.
The state is retrieved using v4l2_subdev_get_locked_active_state() as the subdev active state and the control handler share the same lock.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/media/i2c/imx219.c +7 -2
@@ -500,13 +500,18 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)struct imx219 *imx219 = container_of(ctrl->handler, struct imx219, ctrl_handler);struct i2c_client *client =v4l2_get_subdevdata (&imx219->sd); +const struct v4l2_mbus_framefmt *format; +struct v4l2_subdev_state *state;int ret =0 ; + state =v4l2_subdev_get_locked_active_state (&imx219->sd); + format =v4l2_subdev_get_pad_format (&imx219->sd, state,0 ); +if (ctrl->id ==V4L2_CID_VBLANK ) {int exposure_max, exposure_def;/* Update max exposure while meeting expected vblanking */ - exposure_max = imx219->mode->height + ctrl->val -4 ; + exposure_max = format->height + ctrl->val -4 ; exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? exposure_max :IMX219_EXPOSURE_DEFAULT ; __v4l2_ctrl_modify_range(imx219->exposure,
@@ -546,7 +551,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_VBLANK :cci_write (imx219->regmap,IMX219_REG_VTS , - imx219->mode->height + ctrl->val, &ret); + format->height + ctrl->val, &ret);break ;case V4L2_CID_TEST_PATTERN_RED : cci_write(imx219->regmap, IMX219_REG_TESTP_RED,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/7 media: i2c: imx219: Don't store the current mode in the imx219 structure
From: Laurent Pinchart <[email protected]>
[ Upstream commit e3e5d172d5fce9151bc101427554a158d4759856 ]
The mode field of the imx219 structure is only used in imx219_init_controls(), after the probe function sets it to point to the default mode. Use the default mode directly when initializing controls, and drop the mode field from the imx219 structure.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/media/i2c/imx219.c +7 -6
@@ -1067,8 +1067,8 @@ static unsigned long imx219_get_pixel_rate(struct imx219 *imx219)static int imx219_init_controls (struct imx219 *imx219) {struct i2c_client *client =v4l2_get_subdevdata (&imx219->sd); +const struct imx219_mode *mode = &supported_modes[0 ];struct v4l2_ctrl_handler *ctrl_hdlr; -unsigned int height = imx219->mode->height;struct v4l2_fwnode_device_properties props;int exposure_max, exposure_def, hblank;int i, ret;
@@ -1097,15 +1097,15 @@ static int imx219_init_controls(struct imx219 *imx219)/* Initial vblank/hblank/exposure parameters based on current mode */ imx219->vblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_VBLANK ,IMX219_VBLANK_MIN , -IMX219_VTS_MAX - height,1 , - imx219->mode->vts_def - height); - hblank =IMX219_PPL_DEFAULT - imx219->mode->width; +IMX219_VTS_MAX - mode->height,1 , + mode->vts_def - mode->height); + hblank =IMX219_PPL_DEFAULT - mode->width; imx219->hblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_HBLANK , hblank, hblank,1 , hblank);if (imx219->hblank) imx219->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; - exposure_max = imx219->mode->vts_def -4 ; + exposure_max = mode->vts_def -4 ; exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? exposure_max :IMX219_EXPOSURE_DEFAULT ; imx219->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
@@ -1298,7 +1298,8 @@ static int imx219_probe(struct i2c_client *client)/* Set default mode to max resolution */ imx219->mode = &supported_modes[0 ]; -/* sensor doesn't enter LP-11 state upon power up until and unless +/* +* Sensor doesn't enter LP-11 state upon power up until and unless * streaming is started, so upon power up switch the modes to: * streaming -> standby */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/7 media: i2c: imx219: Drop IMX219_VTS_* macros
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 5ebbdd7aab3321e60a8be23aac1fee4f16644021 ]
The IMX219_VTS_* macros define default VTS values for the modes supported by the driver. They are used in a single place, and hinder readability compared to using the value directly as a decimal number. Drop them.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
drivers/media/i2c/imx219.c +4 -14
@@ -71,20 +71,10 @@/* V_TIMING internal */ #define IMX219_REG_VTS CCI_REG16(0x0160) -#define IMX219_VTS_15FPS 0x0dc6 -#define IMX219_VTS_30FPS_1080P 0x06e3 -#define IMX219_VTS_30FPS_BINNED 0x06e3 -#define IMX219_VTS_30FPS_640x480 0x06e3#define IMX219_VTS_MAX 0xffff#define IMX219_VBLANK_MIN 32 -/*Frame Length Line*/ -#define IMX219_FLL_MIN 0x08a6 -#define IMX219_FLL_MAX 0xffff -#define IMX219_FLL_STEP 1 -#define IMX219_FLL_DEFAULT 0x0c98 -/* HBLANK control - read only */ #define IMX219_PPL_DEFAULT 3448
@@ -381,7 +371,7 @@ static const struct imx219_mode supported_modes[] = { .width = 3280, .height =2464 }, - .vts_def = IMX219_VTS_15FPS, + .vts_def = 3526, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs), .regs = mode_3280x2464_regs,
@@ -398,7 +388,7 @@ static const struct imx219_mode supported_modes[] = { .width = 1920, .height =1080 }, - .vts_def = IMX219_VTS_30FPS_1080P, + .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1920_1080_regs), .regs = mode_1920_1080_regs,
@@ -415,7 +405,7 @@ static const struct imx219_mode supported_modes[] = { .width = 3280, .height =2464 }, - .vts_def = IMX219_VTS_30FPS_BINNED, + .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs), .regs = mode_1640_1232_regs,
@@ -432,7 +422,7 @@ static const struct imx219_mode supported_modes[] = { .width = 1280, .height =960 }, - .vts_def = IMX219_VTS_30FPS_640x480, + .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_640_480_regs), .regs = mode_640_480_regs,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/7 media: i2c: imx219: Group functions by purpose
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit d03dfb7d4c5fae0d3f297536063e00ea2c1129d5 ]
Move functions around to group them by purpose, in order to improve readability. No functional change is intended.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 592 +++++++++++++++++++------------------ 1 file changed, 304 insertions(+), 288 deletions(-)
drivers/media/i2c/imx219.c +304 -288
@@ -485,6 +485,10 @@ static u32 imx219_get_format_code(struct imx219 *imx219, u32 code)return imx219_mbus_formats[i]; } +/* ----------------------------------------------------------------------------- +* Controls +*/ +static int imx219_set_ctrl (struct v4l2_ctrl *ctrl) { struct imx219 *imx219 =
@@ -576,130 +580,135 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = { .s_ctrl = imx219_set_ctrl, }; -static void imx219_update_pad_format (struct imx219 *imx219, -const struct imx219_mode *mode, -struct v4l2_mbus_framefmt *fmt,u32 code) +static unsigned long imx219_get_pixel_rate (struct imx219 *imx219) { -/* Bayer order varies with flips */ - fmt->code =imx219_get_format_code (imx219, code); - fmt->width = mode->width; - fmt->height = mode->height; - fmt->field =V4L2_FIELD_NONE ; - fmt->colorspace =V4L2_COLORSPACE_RAW ; - fmt->quantization =V4L2_QUANTIZATION_FULL_RANGE ; - fmt->xfer_func =V4L2_XFER_FUNC_NONE ; +return (imx219->lanes ==2 ) ?IMX219_PIXEL_RATE :IMX219_PIXEL_RATE_4LANE ; } -static int imx219_init_cfg (struct v4l2_subdev *sd, -struct v4l2_subdev_state *state) +/* Initialize control handlers */ +static int imx219_init_controls (struct imx219 *imx219) { -struct imx219 *imx219 =to_imx219 (sd); -struct v4l2_mbus_framefmt *format; -struct v4l2_rect *crop; - -/* Initialize the format. */ - format =v4l2_subdev_get_pad_format (sd, state,0 ); -imx219_update_pad_format (imx219, &supported_modes[0 ], format, -MEDIA_BUS_FMT_SRGGB10_1X10 ); - -/* Initialize the crop rectangle. */ - crop =v4l2_subdev_get_pad_crop (sd, state,0 ); - crop->top =IMX219_PIXEL_ARRAY_TOP ; - crop->left =IMX219_PIXEL_ARRAY_LEFT ; - crop->width =IMX219_PIXEL_ARRAY_WIDTH ; - crop->height =IMX219_PIXEL_ARRAY_HEIGHT ; +struct i2c_client *client =v4l2_get_subdevdata (&imx219->sd); +const struct imx219_mode *mode = &supported_modes[0 ]; +struct v4l2_ctrl_handler *ctrl_hdlr; +struct v4l2_fwnode_device_properties props; +int exposure_max, exposure_def, hblank; +int i, ret; -return 0 ; -} + ctrl_hdlr = &imx219->ctrl_handler; + ret =v4l2_ctrl_handler_init (ctrl_hdlr,12 ); +if (ret) +return ret; -static int imx219_enum_mbus_code (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_mbus_code_enum *code) -{ -struct imx219 *imx219 =to_imx219 (sd); +/* By default, PIXEL_RATE is read only */ + imx219->pixel_rate =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_PIXEL_RATE , +imx219_get_pixel_rate (imx219), +imx219_get_pixel_rate (imx219),1 , +imx219_get_pixel_rate (imx219)); -if (code->index >= (ARRAY_SIZE (imx219_mbus_formats) /4 )) -return -EINVAL ; + imx219->link_freq = +v4l2_ctrl_new_int_menu (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_LINK_FREQ , +ARRAY_SIZE (imx219_link_freq_menu) -1 ,0 , + (imx219->lanes ==2 ) ? imx219_link_freq_menu : + imx219_link_freq_4lane_menu); +if (imx219->link_freq) + imx219->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; - code->code =imx219_get_format_code (imx219, imx219_mbus_formats[code->index *4 ]); +/* Initial vblank/hblank/exposure parameters based on current mode */ + imx219->vblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_VBLANK ,IMX219_VBLANK_MIN , +IMX219_VTS_MAX - mode->height,1 , + mode->vts_def - mode->height); + hblank =IMX219_PPL_DEFAULT - mode->width; + imx219->hblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_HBLANK , hblank, hblank, +1 , hblank); +if (imx219->hblank) + imx219->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + exposure_max = mode->vts_def -4 ; + exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? + exposure_max :IMX219_EXPOSURE_DEFAULT ; + imx219->exposure =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_EXPOSURE , +IMX219_EXPOSURE_MIN , exposure_max, +IMX219_EXPOSURE_STEP , + exposure_def); -return 0 ; -} +v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_ANALOGUE_GAIN , +IMX219_ANA_GAIN_MIN ,IMX219_ANA_GAIN_MAX , +IMX219_ANA_GAIN_STEP ,IMX219_ANA_GAIN_DEFAULT ); -static int imx219_enum_frame_size (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_frame_size_enum *fse) -{ -struct imx219 *imx219 =to_imx219 (sd); -u32 code; +v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_DIGITAL_GAIN , +IMX219_DGTL_GAIN_MIN ,IMX219_DGTL_GAIN_MAX , +IMX219_DGTL_GAIN_STEP ,IMX219_DGTL_GAIN_DEFAULT ); -if (fse->index >=ARRAY_SIZE (supported_modes)) -return -EINVAL ; + imx219->hflip =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_HFLIP ,0 ,1 ,1 ,0 ); +if (imx219->hflip) + imx219->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; - code =imx219_get_format_code (imx219, fse->code); -if (fse->code != code) -return -EINVAL ; + imx219->vflip =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_VFLIP ,0 ,1 ,1 ,0 ); +if (imx219->vflip) + imx219->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; - fse->min_width = supported_modes[fse->index].width; - fse->max_width = fse->min_width; - fse->min_height = supported_modes[fse->index].height; - fse->max_height = fse->min_height; +v4l2_ctrl_new_std_menu_items (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_TEST_PATTERN , +ARRAY_SIZE (imx219_test_pattern_menu) -1 , +0 ,0 , imx219_test_pattern_menu); +for (i =0 ; i <4 ; i++) { +/* +* The assumption is that +* V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1 +* V4L2_CID_TEST_PATTERN_BLUE == V4L2_CID_TEST_PATTERN_RED + 2 +* V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3 +*/ +v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, +V4L2_CID_TEST_PATTERN_RED + i, +IMX219_TESTP_COLOUR_MIN , +IMX219_TESTP_COLOUR_MAX , +IMX219_TESTP_COLOUR_STEP , +IMX219_TESTP_COLOUR_MAX ); +/* The "Solid color" pattern is white by default */ + } -return 0 ; -} +if (ctrl_hdlr->error) { + ret = ctrl_hdlr->error; +dev_err (&client->dev,"%s control init failed (%d)\n" , + __func__, ret); + goto error; + } -static int imx219_set_pad_format (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_format *fmt) -{ -struct imx219 *imx219 =to_imx219 (sd); -const struct imx219_mode *mode; -int exposure_max, exposure_def, hblank; -struct v4l2_mbus_framefmt *format; -struct v4l2_rect *crop; + ret =v4l2_fwnode_device_parse (&client->dev, &props); +if (ret) + goto error; - mode =v4l2_find_nearest_size (supported_modes, -ARRAY_SIZE (supported_modes), - width, height, - fmt->format.width, fmt->format.height); + ret =v4l2_ctrl_new_fwnode_properties (ctrl_hdlr, &imx219_ctrl_ops, + &props); +if (ret) + goto error; -imx219_update_pad_format (imx219, mode, &fmt->format, fmt->format.code); + imx219->sd.ctrl_handler = ctrl_hdlr; - format =v4l2_subdev_get_pad_format (sd, sd_state,0 ); - crop =v4l2_subdev_get_pad_crop (sd, sd_state,0 ); +return 0 ; - *format = fmt->format; - *crop = mode->crop; +error: +v4l2_ctrl_handler_free (ctrl_hdlr); -if (fmt->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) { - imx219->mode = mode; -/* Update limits and set FPS to default */ -__v4l2_ctrl_modify_range (imx219->vblank,IMX219_VBLANK_MIN , -IMX219_VTS_MAX - mode->height,1 , - mode->vts_def - mode->height); -__v4l2_ctrl_s_ctrl (imx219->vblank, - mode->vts_def - mode->height); -/* Update max exposure while meeting expected vblanking */ - exposure_max = mode->vts_def -4 ; - exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? - exposure_max :IMX219_EXPOSURE_DEFAULT ; -__v4l2_ctrl_modify_range (imx219->exposure, - imx219->exposure->minimum, - exposure_max, imx219->exposure->step, - exposure_def); -/* -* Currently PPL is fixed to IMX219_PPL_DEFAULT, so hblank -* depends on mode->width only, and is not changeble in any -* way other than changing the mode. -*/ - hblank =IMX219_PPL_DEFAULT - mode->width; -__v4l2_ctrl_modify_range (imx219->hblank, hblank, hblank,1 , - hblank); - } +return ret; +} -return 0 ; +static void imx219_free_controls (struct imx219 *imx219) +{ +v4l2_ctrl_handler_free (imx219->sd.ctrl_handler); } +/* ----------------------------------------------------------------------------- +* Subdev operations +*/ +static int imx219_set_framefmt (struct imx219 *imx219,const struct v4l2_mbus_framefmt *format) {
@@ -748,37 +757,6 @@ static int imx219_set_binning(struct imx219 *imx219,return -EINVAL ; } -static int imx219_get_selection (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_selection *sel) -{ -switch (sel->target) { -case V4L2_SEL_TGT_CROP : { - sel->r = *v4l2_subdev_get_pad_crop (sd, sd_state,0 ); -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 : -case V4L2_SEL_TGT_CROP_BOUNDS : - 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_configure_lanes (struct imx219 *imx219) { return cci_write(imx219->regmap, IMX219_REG_CSI_LANE_MODE,
@@ -907,14 +885,198 @@ static int imx219_set_stream(struct v4l2_subdev *sd, int enable) }/* Power/clock management functions */ -static int imx219_power_on (struct device *dev) +static void imx219_update_pad_format (struct imx219 *imx219, +const struct imx219_mode *mode, +struct v4l2_mbus_framefmt *fmt,u32 code) { -struct v4l2_subdev *sd =dev_get_drvdata (dev); -struct imx219 *imx219 =to_imx219 (sd); -int ret; +/* Bayer order varies with flips */ + fmt->code =imx219_get_format_code (imx219, code); + fmt->width = mode->width; + fmt->height = mode->height; + fmt->field =V4L2_FIELD_NONE ; + fmt->colorspace =V4L2_COLORSPACE_RAW ; + fmt->quantization =V4L2_QUANTIZATION_FULL_RANGE ; + fmt->xfer_func =V4L2_XFER_FUNC_NONE ; +} - ret =regulator_bulk_enable (IMX219_NUM_SUPPLIES , - imx219->supplies); +static int imx219_init_cfg (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state) +{ +struct imx219 *imx219 =to_imx219 (sd); +struct v4l2_mbus_framefmt *format; +struct v4l2_rect *crop; + +/* Initialize the format. */ + format =v4l2_subdev_get_pad_format (sd, state,0 ); +imx219_update_pad_format (imx219, &supported_modes[0 ], format, +MEDIA_BUS_FMT_SRGGB10_1X10 ); + +/* Initialize the crop rectangle. */ + crop =v4l2_subdev_get_pad_crop (sd, state,0 ); + crop->top =IMX219_PIXEL_ARRAY_TOP ; + crop->left =IMX219_PIXEL_ARRAY_LEFT ; + crop->width =IMX219_PIXEL_ARRAY_WIDTH ; + crop->height =IMX219_PIXEL_ARRAY_HEIGHT ; + +return 0 ; +} + +static int imx219_enum_mbus_code (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_mbus_code_enum *code) +{ +struct imx219 *imx219 =to_imx219 (sd); + +if (code->index >= (ARRAY_SIZE (imx219_mbus_formats) /4 )) +return -EINVAL ; + + code->code =imx219_get_format_code (imx219, imx219_mbus_formats[code->index *4 ]); + +return 0 ; +} + +static int imx219_enum_frame_size (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_frame_size_enum *fse) +{ +struct imx219 *imx219 =to_imx219 (sd); +u32 code; + +if (fse->index >=ARRAY_SIZE (supported_modes)) +return -EINVAL ; + + code =imx219_get_format_code (imx219, fse->code); +if (fse->code != code) +return -EINVAL ; + + fse->min_width = supported_modes[fse->index].width; + fse->max_width = fse->min_width; + fse->min_height = supported_modes[fse->index].height; + fse->max_height = fse->min_height; + +return 0 ; +} + +static int imx219_set_pad_format (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_format *fmt) +{ +struct imx219 *imx219 =to_imx219 (sd); +const struct imx219_mode *mode; +int exposure_max, exposure_def, hblank; +struct v4l2_mbus_framefmt *format; +struct v4l2_rect *crop; + + mode =v4l2_find_nearest_size (supported_modes, +ARRAY_SIZE (supported_modes), + width, height, + fmt->format.width, fmt->format.height); + +imx219_update_pad_format (imx219, mode, &fmt->format, fmt->format.code); + + format =v4l2_subdev_get_pad_format (sd, sd_state,0 ); + crop =v4l2_subdev_get_pad_crop (sd, sd_state,0 ); + + *format = fmt->format; + *crop = mode->crop; + +if (fmt->which ==V4L2_SUBDEV_FORMAT_ACTIVE ) { + imx219->mode = mode; +/* Update limits and set FPS to default */ +__v4l2_ctrl_modify_range (imx219->vblank,IMX219_VBLANK_MIN , +IMX219_VTS_MAX - mode->height,1 , + mode->vts_def - mode->height); +__v4l2_ctrl_s_ctrl (imx219->vblank, + mode->vts_def - mode->height); +/* Update max exposure while meeting expected vblanking */ + exposure_max = mode->vts_def -4 ; + exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? + exposure_max :IMX219_EXPOSURE_DEFAULT ; +__v4l2_ctrl_modify_range (imx219->exposure, + imx219->exposure->minimum, + exposure_max, imx219->exposure->step, + exposure_def); +/* +* Currently PPL is fixed to IMX219_PPL_DEFAULT, so hblank +* depends on mode->width only, and is not changeble in any +* way other than changing the mode. +*/ + hblank =IMX219_PPL_DEFAULT - mode->width; +__v4l2_ctrl_modify_range (imx219->hblank, hblank, hblank,1 , + hblank); + } + +return 0 ; +} + +static int imx219_get_selection (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state, +struct v4l2_subdev_selection *sel) +{ +switch (sel->target) { +case V4L2_SEL_TGT_CROP : { + sel->r = *v4l2_subdev_get_pad_crop (sd, sd_state,0 ); +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 : +case V4L2_SEL_TGT_CROP_BOUNDS : + 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 const struct v4l2_subdev_core_ops imx219_core_ops = { + .subscribe_event = v4l2_ctrl_subdev_subscribe_event, + .unsubscribe_event = v4l2_event_subdev_unsubscribe, +}; + +static const struct v4l2_subdev_video_ops imx219_video_ops = { + .s_stream = imx219_set_stream, +}; + +static const struct v4l2_subdev_pad_ops imx219_pad_ops = { + .init_cfg = imx219_init_cfg, + .enum_mbus_code = imx219_enum_mbus_code, + .get_fmt = v4l2_subdev_get_fmt, + .set_fmt = imx219_set_pad_format, + .get_selection = imx219_get_selection, + .enum_frame_size = imx219_enum_frame_size, +}; + +static const struct v4l2_subdev_ops imx219_subdev_ops = { + .core = &imx219_core_ops, + .video = &imx219_video_ops, + .pad = &imx219_pad_ops, +}; + + +/* ----------------------------------------------------------------------------- +* Power management +*/ + +static int imx219_power_on (struct device *dev) +{ +struct v4l2_subdev *sd =dev_get_drvdata (dev); +struct imx219 *imx219 =to_imx219 (sd); +int ret; + + ret =regulator_bulk_enable (IMX219_NUM_SUPPLIES , + imx219->supplies);if (ret) {dev_err (dev,"%s: failed to enable regulators\n" , __func__);
@@ -987,6 +1149,10 @@ static int __maybe_unused imx219_resume(struct device *dev)return ret; } +/* ----------------------------------------------------------------------------- +* Probe & remove +*/ +static int imx219_get_regulators (struct imx219 *imx219) {struct i2c_client *client =v4l2_get_subdevdata (&imx219->sd);
@@ -1023,156 +1189,6 @@ static int imx219_identify_module(struct imx219 *imx219)return 0 ; } -static const struct v4l2_subdev_core_ops imx219_core_ops = { - .subscribe_event = v4l2_ctrl_subdev_subscribe_event, - .unsubscribe_event = v4l2_event_subdev_unsubscribe, -}; - -static const struct v4l2_subdev_video_ops imx219_video_ops = { - .s_stream = imx219_set_stream, -}; - -static const struct v4l2_subdev_pad_ops imx219_pad_ops = { - .init_cfg = imx219_init_cfg, - .enum_mbus_code = imx219_enum_mbus_code, - .get_fmt = v4l2_subdev_get_fmt, - .set_fmt = imx219_set_pad_format, - .get_selection = imx219_get_selection, - .enum_frame_size = imx219_enum_frame_size, -}; - -static const struct v4l2_subdev_ops imx219_subdev_ops = { - .core = &imx219_core_ops, - .video = &imx219_video_ops, - .pad = &imx219_pad_ops, -}; - - -static unsigned long imx219_get_pixel_rate (struct imx219 *imx219) -{ -return (imx219->lanes ==2 ) ?IMX219_PIXEL_RATE :IMX219_PIXEL_RATE_4LANE ; -} - -/* Initialize control handlers */ -static int imx219_init_controls (struct imx219 *imx219) -{ -struct i2c_client *client =v4l2_get_subdevdata (&imx219->sd); -const struct imx219_mode *mode = &supported_modes[0 ]; -struct v4l2_ctrl_handler *ctrl_hdlr; -struct v4l2_fwnode_device_properties props; -int exposure_max, exposure_def, hblank; -int i, ret; - - ctrl_hdlr = &imx219->ctrl_handler; - ret =v4l2_ctrl_handler_init (ctrl_hdlr,12 ); -if (ret) -return ret; - -/* By default, PIXEL_RATE is read only */ - imx219->pixel_rate =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_PIXEL_RATE , -imx219_get_pixel_rate (imx219), -imx219_get_pixel_rate (imx219),1 , -imx219_get_pixel_rate (imx219)); - - imx219->link_freq = -v4l2_ctrl_new_int_menu (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_LINK_FREQ , -ARRAY_SIZE (imx219_link_freq_menu) -1 ,0 , - (imx219->lanes ==2 ) ? imx219_link_freq_menu : - imx219_link_freq_4lane_menu); -if (imx219->link_freq) - imx219->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; - -/* Initial vblank/hblank/exposure parameters based on current mode */ - imx219->vblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_VBLANK ,IMX219_VBLANK_MIN , -IMX219_VTS_MAX - mode->height,1 , - mode->vts_def - mode->height); - hblank =IMX219_PPL_DEFAULT - mode->width; - imx219->hblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_HBLANK , hblank, hblank, -1 , hblank); -if (imx219->hblank) - imx219->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; - exposure_max = mode->vts_def -4 ; - exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? - exposure_max :IMX219_EXPOSURE_DEFAULT ; - imx219->exposure =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_EXPOSURE , -IMX219_EXPOSURE_MIN , exposure_max, -IMX219_EXPOSURE_STEP , - exposure_def); - -v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_ANALOGUE_GAIN , -IMX219_ANA_GAIN_MIN ,IMX219_ANA_GAIN_MAX , -IMX219_ANA_GAIN_STEP ,IMX219_ANA_GAIN_DEFAULT ); - -v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_DIGITAL_GAIN , -IMX219_DGTL_GAIN_MIN ,IMX219_DGTL_GAIN_MAX , -IMX219_DGTL_GAIN_STEP ,IMX219_DGTL_GAIN_DEFAULT ); - - imx219->hflip =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_HFLIP ,0 ,1 ,1 ,0 ); -if (imx219->hflip) - imx219->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; - - imx219->vflip =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_VFLIP ,0 ,1 ,1 ,0 ); -if (imx219->vflip) - imx219->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; - -v4l2_ctrl_new_std_menu_items (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_TEST_PATTERN , -ARRAY_SIZE (imx219_test_pattern_menu) -1 , -0 ,0 , imx219_test_pattern_menu); -for (i =0 ; i <4 ; i++) { -/* -* The assumption is that -* V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1 -* V4L2_CID_TEST_PATTERN_BLUE == V4L2_CID_TEST_PATTERN_RED + 2 -* V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3 -*/ -v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops, -V4L2_CID_TEST_PATTERN_RED + i, -IMX219_TESTP_COLOUR_MIN , -IMX219_TESTP_COLOUR_MAX , -IMX219_TESTP_COLOUR_STEP , -IMX219_TESTP_COLOUR_MAX ); -/* The "Solid color" pattern is white by default */ - } - -if (ctrl_hdlr->error) { - ret = ctrl_hdlr->error; -dev_err (&client->dev,"%s control init failed (%d)\n" , - __func__, ret); - goto error; - } - - ret =v4l2_fwnode_device_parse (&client->dev, &props); -if (ret) - goto error; - - ret =v4l2_ctrl_new_fwnode_properties (ctrl_hdlr, &imx219_ctrl_ops, - &props); -if (ret) - goto error; - - imx219->sd.ctrl_handler = ctrl_hdlr; - -return 0 ; - -error: -v4l2_ctrl_handler_free (ctrl_hdlr); - -return ret; -} - -static void imx219_free_controls (struct imx219 *imx219) -{ -v4l2_ctrl_handler_free (imx219->sd.ctrl_handler); -} -static int imx219_check_hwcfg (struct device *dev,struct imx219 *imx219) {struct fwnode_handle *endpoint;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/7 media: i2c: imx219: Calculate crop rectangle dynamically
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 0af46fbc333d1a52c72823d935590410357bab47 ]
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.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 45 +++++++++++++------------------------- 1 file changed, 15 insertions(+), 30 deletions(-)
drivers/media/i2c/imx219.c +15 -30
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/gpio/consumer.h> #include <linux/i2c.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h>
@@ -161,9 +162,6 @@ struct imx219_mode {/* Frame height */ unsigned int height; -/* Analog crop rectangle. */ -struct v4l2_rect crop; -/* V-timing */ unsigned int vts_def;
@@ -365,12 +363,6 @@ static const struct imx219_mode supported_modes[] = {/* 8MPix 15fps mode */ .width = 3280, .height = 2464, - .crop = { - .left = IMX219_PIXEL_ARRAY_LEFT, - .top = IMX219_PIXEL_ARRAY_TOP, - .width = 3280, - .height =2464 - }, .vts_def = 3526, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs),
@@ -382,12 +374,6 @@ static const struct imx219_mode supported_modes[] = {/* 1080P 30fps cropped */ .width = 1920, .height = 1080, - .crop = { - .left = 688, - .top = 700, - .width = 1920, - .height =1080 - }, .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1920_1080_regs),
@@ -399,12 +385,6 @@ static const struct imx219_mode supported_modes[] = {/* 2x2 binned 30fps mode */ .width = 1640, .height = 1232, - .crop = { - .left = IMX219_PIXEL_ARRAY_LEFT, - .top = IMX219_PIXEL_ARRAY_TOP, - .width = 3280, - .height =2464 - }, .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs),
@@ -416,12 +396,6 @@ static const struct imx219_mode supported_modes[] = {/* 640x480 30fps mode */ .width = 640, .height = 480, - .crop = { - .left = 1008, - .top = 760, - .width = 1280, - .height =960 - }, .vts_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_640_480_regs),
@@ -966,6 +940,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,int exposure_max, exposure_def, hblank;struct v4l2_mbus_framefmt *format;struct v4l2_rect *crop; +unsigned int bin_h, bin_v; mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes),
@@ -975,10 +950,20 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,imx219_update_pad_format (imx219, mode, &fmt->format, fmt->format.code); format =v4l2_subdev_get_pad_format (sd, sd_state,0 ); - crop =v4l2_subdev_get_pad_crop (sd, sd_state,0 ); - *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 ) { imx219->mode = mode;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/7 media: i2c: imx219: Rename VTS to FRM_LENGTH
In reply to Sasha LevinFrom: Jai Luthra <[email protected]>
[ Upstream commit 04f78503f99ae7e9887c7fe5e4bc54a7cfb10fe0 ]
The IMX219 datasheet refers to the vertical length + blanking as FRM_LENGTH instead of VTS.
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/media/i2c/imx219.c +15 -16
@@ -71,9 +71,8 @@#define IMX219_EXPOSURE_MAX 65535/* V_TIMING internal */ -#define IMX219_REG_VTS CCI_REG16(0x0160) -#define IMX219_VTS_MAX 0xffff - +#define IMX219_REG_FRM_LENGTH_A CCI_REG16(0x0160) +#define IMX219_FLL_MAX 0xffff#define IMX219_VBLANK_MIN 32/* HBLANK control - read only */
@@ -163,7 +162,7 @@ struct imx219_mode {unsigned int height;/* V-timing */ -unsigned int vts_def; +unsigned int fll_def;/* Default register values */ struct imx219_reg_list reg_list;
@@ -363,7 +362,7 @@ static const struct imx219_mode supported_modes[] = {/* 8MPix 15fps mode */ .width = 3280, .height = 2464, - .vts_def = 3526, + .fll_def = 3526, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs), .regs = mode_3280x2464_regs,
@@ -374,7 +373,7 @@ static const struct imx219_mode supported_modes[] = {/* 1080P 30fps cropped */ .width = 1920, .height = 1080, - .vts_def = 1763, + .fll_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1920_1080_regs), .regs = mode_1920_1080_regs,
@@ -385,7 +384,7 @@ static const struct imx219_mode supported_modes[] = {/* 2x2 binned 30fps mode */ .width = 1640, .height = 1232, - .vts_def = 1763, + .fll_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs), .regs = mode_1640_1232_regs,
@@ -396,7 +395,7 @@ static const struct imx219_mode supported_modes[] = {/* 640x480 30fps mode */ .width = 640, .height = 480, - .vts_def = 1763, + .fll_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_640_480_regs), .regs = mode_640_480_regs,
@@ -518,7 +517,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) imx219->hflip->val | imx219->vflip->val << 1, &ret);break ;case V4L2_CID_VBLANK : -cci_write (imx219->regmap,IMX219_REG_VTS , +cci_write (imx219->regmap,IMX219_REG_FRM_LENGTH_A , format->height + ctrl->val, &ret);break ;case V4L2_CID_TEST_PATTERN_RED :
@@ -593,15 +592,15 @@ static int imx219_init_controls(struct imx219 *imx219)/* Initial vblank/hblank/exposure parameters based on current mode */ imx219->vblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_VBLANK ,IMX219_VBLANK_MIN , -IMX219_VTS_MAX - mode->height,1 , - mode->vts_def - mode->height); +IMX219_FLL_MAX - mode->height,1 , + mode->fll_def - mode->height); hblank =IMX219_PPL_DEFAULT - mode->width; imx219->hblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_HBLANK , hblank, hblank,1 , hblank);if (imx219->hblank) imx219->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; - exposure_max = mode->vts_def -4 ; + exposure_max = mode->fll_def -4 ; exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? exposure_max :IMX219_EXPOSURE_DEFAULT ; imx219->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
@@ -969,12 +968,12 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, imx219->mode = mode;/* Update limits and set FPS to default */ __v4l2_ctrl_modify_range (imx219->vblank,IMX219_VBLANK_MIN , -IMX219_VTS_MAX - mode->height,1 , - mode->vts_def - mode->height); +IMX219_FLL_MAX - mode->height,1 , + mode->fll_def - mode->height);__v4l2_ctrl_s_ctrl (imx219->vblank, - mode->vts_def - mode->height); + mode->fll_def - mode->height);/* Update max exposure while meeting expected vblanking */ - exposure_max = mode->vts_def -4 ; + exposure_max = mode->fll_def -4 ; exposure_def = (exposure_max <IMX219_EXPOSURE_DEFAULT ) ? exposure_max :IMX219_EXPOSURE_DEFAULT ; __v4l2_ctrl_modify_range(imx219->exposure,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 7/7 media: imx219: Fix maximum frame length in lines
In reply to Sasha LevinFrom: Sakari Ailus <[email protected]>
[ Upstream commit 2c4f1ba7354312ad2d6e34e70a518a51a9344715 ]
The driver used the maximum frame length in lines value of 0xffff, but the maximum appears to be 0xfffe instead. Fix it.
--- drivers/media/i2c/imx219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/imx219.c +1 -1
@@ -72,7 +72,7 @@/* V_TIMING internal */ #define IMX219_REG_FRM_LENGTH_A CCI_REG16(0x0160) -#define IMX219_FLL_MAX 0xffff +#define IMX219_FLL_MAX 0xfffe#define IMX219_VBLANK_MIN 32/* HBLANK control - read only */
Signature · 1 line
2.53.0