drivers: media: imx500: Simplify the vblank control init

Set the VBLANK control minimum and default values to IMX500_VBLANK_MIN unconditionally everywhere. Remove the mode specific framerate_default parameter, it is now unused. Signed-off-by: Naushir Patuck <[email protected]>
raspberrypi · Sep 26, 2024 · 0094eba · 0094eba
1 parent d290bef
commit 0094eba
Showing 1 changed file with 5 additions and 27 deletions.
diff --git a/drivers/media/i2c/imx500.c b/drivers/media/i2c/imx500.c
@@ -274,9 +274,6 @@ struct imx500_mode {
 	/* Analog crop rectangle. */
 	struct v4l2_rect crop;
 
-	/* Default framerate. */
-	unsigned int framerate_default;
-
 	/* Default register values */
 	struct imx500_reg_list reg_list;
 };
@@ -905,7 +902,6 @@ static const struct imx500_mode imx500_supported_modes[] = {
 			.width = 4056,
 			.height = 3040,
 		},
-		.framerate_default = 10,
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_4056x3040_regs),
 			.regs = mode_4056x3040_regs,
@@ -922,7 +918,6 @@ static const struct imx500_mode imx500_supported_modes[] = {
 			.width = 4056,
 			.height = 3040,
 		},
-		.framerate_default = 30,
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_2028x1520_regs),
 			.regs = mode_2028x1520_regs,
@@ -1744,40 +1739,22 @@ static int imx500_get_pad_format(struct v4l2_subdev *sd,
 	return 0;
 }
 
-static unsigned int imx500_get_frame_length(const struct imx500_mode *mode,
-					    unsigned int framerate_default)
-{
-	u64 frame_length;
-
-	frame_length = IMX500_PIXEL_RATE;
-	do_div(frame_length, (u64)framerate_default * mode->line_length_pix);
-
-	if (WARN_ON(frame_length > IMX500_FRAME_LENGTH_MAX))
-		frame_length = IMX500_FRAME_LENGTH_MAX;
-
-	return max_t(unsigned int, frame_length, mode->height);
-}
-
 static void imx500_set_framing_limits(struct imx500 *imx500)
 {
-	unsigned int frm_length_default, hblank_min;
+	unsigned int hblank_min;
 	const struct imx500_mode *mode = imx500->mode;
 
-	frm_length_default =
-		imx500_get_frame_length(mode, mode->framerate_default);
-
 	/* Default to no long exposure multiplier. */
 	imx500->long_exp_shift = 0;
 
 	/* Update limits and set FPS to default */
 	__v4l2_ctrl_modify_range(
 		imx500->vblank, IMX500_VBLANK_MIN,
 		((1 << IMX500_LONG_EXP_SHIFT_MAX) * IMX500_FRAME_LENGTH_MAX) -
-			mode->height,
-		1, frm_length_default - mode->height);
+			mode->height, 1, IMX500_VBLANK_MIN);
 
 	/* Setting this will adjust the exposure limits as well. */
-	__v4l2_ctrl_s_ctrl(imx500->vblank, frm_length_default - mode->height);
+	__v4l2_ctrl_s_ctrl(imx500->vblank, IMX500_VBLANK_MIN);
 
 	hblank_min = mode->line_length_pix - mode->width;
 	__v4l2_ctrl_modify_range(imx500->hblank, hblank_min, hblank_min, 1,
@@ -2499,7 +2476,8 @@ static int imx500_init_controls(struct imx500 *imx500)
 	 * in the imx500_set_framing_limits() call below.
 	 */
 	imx500->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx500_ctrl_ops,
-					   V4L2_CID_VBLANK, 0, 0xffff, 1, 0);
+					   V4L2_CID_VBLANK, IMX500_VBLANK_MIN,
+					   0xffff, 1, IMX500_VBLANK_MIN);
 	imx500->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx500_ctrl_ops,
 					   V4L2_CID_HBLANK, 0, 0xffff, 1, 0);