Revert "media: i2c: imx477: Extend V4L2_CID_VBLANK range"

This reverts commit 204d0f9.

Author: 6by9

drivers/media/i2c/imx477.c

@@ -53,7 +53,6 @@ MODULE_PARM_DESC(trigger_mode, "Set vsync trigger mode: 1=source, 2=sink");
 /* V_TIMING internal */
 #define IMX477_REG_FRAME_LENGTH		0x0340
 #define IMX477_FRAME_LENGTH_MAX		0xffdc
-#define IMX477_VBLANK_MIN		4
 
 /* H_TIMING internal */
 #define IMX477_REG_LINE_LENGTH		0x0342
@@ -158,8 +157,11 @@ struct imx477_mode {
 	/* Analog crop rectangle. */
 	struct v4l2_rect crop;
 
+	/* Highest possible framerate. */
+	struct v4l2_fract timeperframe_min;
+
 	/* Default framerate. */
-	unsigned int framerate_default;
+	struct v4l2_fract timeperframe_default;
 
 	/* Default register values */
 	struct imx477_reg_list reg_list;
@@ -867,7 +869,14 @@ static const struct imx477_mode supported_modes_12bit[] = {
 			.width = 4056,
 			.height = 3040,
 		},
-		.framerate_default = 10,
+		.timeperframe_min = {
+			.numerator = 100,
+			.denominator = 1000
+		},
+		.timeperframe_default = {
+			.numerator = 100,
+			.denominator = 1000
+		},
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_4056x3040_regs),
 			.regs = mode_4056x3040_regs,
@@ -884,7 +893,14 @@ static const struct imx477_mode supported_modes_12bit[] = {
 			.width = 4056,
 			.height = 3040,
 		},
-		.framerate_default = 30,
+		.timeperframe_min = {
+			.numerator = 100,
+			.denominator = 4000
+		},
+		.timeperframe_default = {
+			.numerator = 100,
+			.denominator = 3000
+		},
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_2028x1520_regs),
 			.regs = mode_2028x1520_regs,
@@ -901,7 +917,14 @@ static const struct imx477_mode supported_modes_12bit[] = {
 			.width = 4056,
 			.height = 2160,
 		},
-		.framerate_default = 30,
+		.timeperframe_min = {
+			.numerator = 100,
+			.denominator = 5000
+		},
+		.timeperframe_default = {
+			.numerator = 100,
+			.denominator = 3000
+		},
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_2028x1080_regs),
 			.regs = mode_2028x1080_regs,
@@ -929,7 +952,14 @@ static const struct imx477_mode supported_modes_10bit[] = {
 			.width = 2664,
 			.height = 1980,
 		},
-		.framerate_default = 120,
+		.timeperframe_min = {
+			.numerator = 100,
+			.denominator = 12000
+		},
+		.timeperframe_default = {
+			.numerator = 100,
+			.denominator = 12000
+		},
 		.reg_list = {
 			.num_of_regs = ARRAY_SIZE(mode_1332x990_regs),
 			.regs = mode_1332x990_regs,
@@ -1472,13 +1502,13 @@ static int imx477_get_pad_format(struct v4l2_subdev *sd,
 
 static
 unsigned int imx477_get_frame_length(const struct imx477_mode *mode,
-				     unsigned int framerate_default)
+				     const struct v4l2_fract *timeperframe)
 {
 	u64 frame_length;
 
-	frame_length = IMX477_PIXEL_RATE;
+	frame_length = (u64)timeperframe->numerator * IMX477_PIXEL_RATE;
 	do_div(frame_length,
-	       (u64)framerate_default * mode->line_length_pix);
+	       (u64)timeperframe->denominator * mode->line_length_pix);
 
 	if (WARN_ON(frame_length > IMX477_FRAME_LENGTH_MAX))
 		frame_length = IMX477_FRAME_LENGTH_MAX;
@@ -1488,20 +1518,21 @@ unsigned int imx477_get_frame_length(const struct imx477_mode *mode,
 
 static void imx477_set_framing_limits(struct imx477 *imx477)
 {
-	unsigned int frm_length_default, hblank_min;
+	unsigned int frm_length_min, frm_length_default, hblank_min;
 	const struct imx477_mode *mode = imx477->mode;
 
+	frm_length_min = imx477_get_frame_length(mode, &mode->timeperframe_min);
 	frm_length_default =
-		     imx477_get_frame_length(mode, mode->framerate_default);
+		     imx477_get_frame_length(mode, &mode->timeperframe_default);
 
 	/* Default to no long exposure multiplier. */
 	imx477->long_exp_shift = 0;
 
 	/* Update limits and set FPS to default */
-	__v4l2_ctrl_modify_range(imx477->vblank, 1,
+	__v4l2_ctrl_modify_range(imx477->vblank, frm_length_min - mode->height,
 				 ((1 << IMX477_LONG_EXP_SHIFT_MAX) *
 					IMX477_FRAME_LENGTH_MAX) - mode->height,
-				 IMX477_VBLANK_MIN, frm_length_default - mode->height);
+				 1, frm_length_default - mode->height);
 
 	/* Setting this will adjust the exposure limits as well. */
 	__v4l2_ctrl_s_ctrl(imx477->vblank, frm_length_default - mode->height);