FAILED: patch "[PATCH] media: imx219: Fix maximum frame length in lines" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-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-5.15.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 '2026072956-strum-murmuring-51d3@gregkh' --subject-prefix 'PATCH 5.15.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/4 media: i2c: imx219: Drop IMX219_VTS_* macros
From: 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 | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/media/i2c/imx219.c +7 -17
@@ -49,20 +49,10 @@/* V_TIMING internal */ #define IMX219_REG_VTS 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_FLL_MAX 0xffff#define IMX219_VBLANK_MIN 4 -/*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
@@ -386,7 +376,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,
@@ -403,7 +393,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,
@@ -420,7 +410,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,
@@ -437,7 +427,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,
@@ -841,7 +831,7 @@ 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 , +IMX219_FLL_MAX - mode->height,1 , mode->vts_def - mode->height);__v4l2_ctrl_s_ctrl (imx219->vblank, mode->vts_def - mode->height);
@@ -1261,7 +1251,7 @@ 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_FLL_MAX - height,1 , imx219->mode->vts_def - height); hblank =IMX219_PPL_DEFAULT - imx219->mode->width; imx219->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/4 media: i2c: imx219: Correct the minimum vblanking value
From: David Plowman <[email protected]>
[ Upstream commit e3b82d49bf676f3c873e642038765eac32ab6d39 ]
The datasheet for this sensor documents the minimum vblanking as being 32 lines. It does fix some problems with occasional black lines at the bottom of images (tested on Raspberry Pi).
Stable-dep-of: 2c4f1ba73543 ("media: imx219: Fix maximum frame length in lines")
--- drivers/media/i2c/imx219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/i2c/imx219.c +1 -1
@@ -51,7 +51,7 @@#define IMX219_REG_VTS 0x0160#define IMX219_FLL_MAX 0xffff -#define IMX219_VBLANK_MIN 4 +#define IMX219_VBLANK_MIN 32/* HBLANK control - read only */ #define IMX219_PPL_DEFAULT 3448
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/4 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 | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/media/i2c/imx219.c +16 -17
@@ -47,12 +47,6 @@#define IMX219_DEFAULT_LINK_FREQ 456000000 -/* V_TIMING internal */ -#define IMX219_REG_VTS 0x0160 -#define IMX219_FLL_MAX 0xffff - -#define IMX219_VBLANK_MIN 32 -/* HBLANK control - read only */ #define IMX219_PPL_DEFAULT 3448
@@ -77,6 +71,11 @@#define IMX219_DGTL_GAIN_DEFAULT 0x0100#define IMX219_DGTL_GAIN_STEP 1 +/* V_TIMING internal */ +#define IMX219_REG_FRM_LENGTH_A 0x0160 +#define IMX219_FLL_MAX 0xffff +#define IMX219_VBLANK_MIN 32 +#define IMX219_REG_ORIENTATION 0x0172/* Binning Mode */
@@ -135,7 +134,7 @@ struct imx219_mode {struct v4l2_rect crop;/* V-timing */ -unsigned int vts_def; +unsigned int fll_def;/* Default register values */ struct imx219_reg_list reg_list;
@@ -376,7 +375,7 @@ static const struct imx219_mode supported_modes[] = { .width = 3280, .height =2464 }, - .vts_def = 3526, + .fll_def = 3526, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_3280x2464_regs), .regs = mode_3280x2464_regs,
@@ -393,7 +392,7 @@ static const struct imx219_mode supported_modes[] = { .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,
@@ -410,7 +409,7 @@ static const struct imx219_mode supported_modes[] = { .width = 3280, .height =2464 }, - .vts_def = 1763, + .fll_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_1640_1232_regs), .regs = mode_1640_1232_regs,
@@ -427,7 +426,7 @@ static const struct imx219_mode supported_modes[] = { .width = 1280, .height =960 }, - .vts_def = 1763, + .fll_def = 1763, .reg_list = { .num_of_regs = ARRAY_SIZE(mode_640_480_regs), .regs = mode_640_480_regs,
@@ -665,7 +664,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) imx219->vflip->val << 1);break ;case V4L2_CID_VBLANK : - ret =imx219_write_reg (imx219,IMX219_REG_VTS , + ret =imx219_write_reg (imx219,IMX219_REG_FRM_LENGTH_A ,IMX219_REG_VALUE_16BIT , imx219->mode->height + ctrl->val);break ;
@@ -832,11 +831,11 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd,/* Update limits and set FPS to default */ __v4l2_ctrl_modify_range (imx219->vblank,IMX219_VBLANK_MIN ,IMX219_FLL_MAX - mode->height,1 , - mode->vts_def - mode->height); + 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,
@@ -1252,14 +1251,14 @@ static int imx219_init_controls(struct imx219 *imx219) imx219->vblank =v4l2_ctrl_new_std (ctrl_hdlr, &imx219_ctrl_ops,V4L2_CID_VBLANK ,IMX219_VBLANK_MIN ,IMX219_FLL_MAX - height,1 , - imx219->mode->vts_def - height); + imx219->mode->fll_def - height); hblank =IMX219_PPL_DEFAULT - imx219->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 = imx219->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,
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/4 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
@@ -73,7 +73,7 @@/* V_TIMING internal */ #define IMX219_REG_FRM_LENGTH_A 0x0160 -#define IMX219_FLL_MAX 0xffff +#define IMX219_FLL_MAX 0xfffe#define IMX219_VBLANK_MIN 32#define IMX219_REG_ORIENTATION 0x0172
Signature · 1 line
2.53.0