media: ov5640: Drop dead code using frame_interval
The ov5640_update_pixel_rate() function handles the parallel and MIPI CSI-2 cases separately. When running on a parallel setup the V4L2_CID_PIXEL_RATE value is calculated at the beginning of the function using the values configured with the frame_interval operations, and then the function immediately returns. The remaining of the function handles the MIPI CSI-2 configuration and should not use the 'current_fr' and 'def_fps' fields as those are only relevant for parallel mode. Drop a small section of dead code that updates vblank using frame_interval on a MIPI CSI-2 setup. Signed-off-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:
parent
25affde33b
commit
eeaa47d182
@ -2926,19 +2926,6 @@ static int ov5640_update_pixel_rate(struct ov5640_dev *sensor)
|
||||
hblank, hblank, 1, hblank);
|
||||
|
||||
vblank = timings->vblank_def;
|
||||
|
||||
if (sensor->current_fr != mode->def_fps) {
|
||||
/*
|
||||
* Compute the vertical blanking according to the framerate
|
||||
* configured with s_frame_interval.
|
||||
*/
|
||||
int fie_num = sensor->frame_interval.numerator;
|
||||
int fie_denom = sensor->frame_interval.denominator;
|
||||
|
||||
vblank = ((fie_num * pixel_rate / fie_denom) / timings->htot) -
|
||||
mode->height;
|
||||
}
|
||||
|
||||
__v4l2_ctrl_modify_range(sensor->ctrls.vblank, OV5640_MIN_VBLANK,
|
||||
OV5640_MAX_VTS - mode->height, 1, vblank);
|
||||
__v4l2_ctrl_s_ctrl(sensor->ctrls.vblank, vblank);
|
||||
|
Loading…
x
Reference in New Issue
Block a user