media: ov2680: Add all controls required by libcamera
v2 cover media: ov2680: Add all controls required by libcamera
Hi All,
Here is a resend of my patch-series to add all controls required by libcamera to the ov2680 driver.
Changes in v2:
- Add error checking to __v4l2_ctrl_modify_range() and __v4l2_ctrl_s_ctrl() calls
- Set hblank read-only flag after checking hdl->error (avoids the need for an if (ctrls->hblank) check)
- Use hdl->error to error check v4l2_ctrl_new_fwnode_properties()
This has been tested together with the atomisp using the simple pipelinehandler. This should also work in IPU3 based devices with an ov2680.
Note the vblank control new default value after a mode-set call has been chosen so as to preserve the old behavior of always running at 30 fps, so as to not change behavior for any existing use-cases.
Regards,
Hans
Hans de Goede (5):
media: ov2680: Stop sending more data then requested
media: ov2680: Drop hts, vts ov2680_mode struct members
media: ov2680: Add vblank control
media: ov2680: Add hblank control
media: ov2680: Add camera orientation and sensor rotation controls
drivers/media/i2c/ov2680.c | 90 ++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 19 deletions(-)
Signature · 1 line
2.44.0
PATCH v2 1/5 media: ov2680: Stop sending more data then requested
There is no reason to send OV2680_END_MARGIN extra columns on top of the mode width and the same for sending extra lines over the mode height.
This sending of extra lines/columns was inherited from the atomisp ov2680 driver, it is unclear why this was done and this complicates adding V4L2_CID_VBLANK support, so remove it.
--- drivers/media/i2c/ov2680.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/media/i2c/ov2680.c +2 -7
@@ -86,9 +86,6 @@#define OV2680_PIXELS_PER_LINE 1704#define OV2680_LINES_PER_FRAME 1294 -/* If possible send 16 extra rows / lines to the ISP as padding */ -#define OV2680_END_MARGIN 16 -/* Max exposure time is VTS - 8 */ #define OV2680_INTEGRATION_TIME_MARGIN 8
@@ -359,11 +356,9 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor) sensor->mode.v_start = (sensor->mode.crop.top + (sensor->mode.crop.height - height) /2 ) & ~1 ; sensor->mode.h_end = -min (sensor->mode.h_start + width +OV2680_END_MARGIN -1 , -OV2680_NATIVE_WIDTH -1 ); +min (sensor->mode.h_start + width -1 ,OV2680_NATIVE_WIDTH -1 ); sensor->mode.v_end = -min (sensor->mode.v_start + height +OV2680_END_MARGIN -1 , -OV2680_NATIVE_HEIGHT -1 ); +min (sensor->mode.v_start + height -1 ,OV2680_NATIVE_HEIGHT -1 ); sensor->mode.h_output_size = orig_width; sensor->mode.v_output_size = orig_height; sensor->mode.hts =OV2680_PIXELS_PER_LINE ;
Signature · 1 line
2.44.0
PATCH v2 2/5 media: ov2680: Drop hts, vts ov2680_mode struct members
In reply to Hans de GoedeThe hts, vts ov2680_mode struct members always contain OV2680_PIXELS_PER_LINE resp. OV2680_LINES_PER_FRAME, drop them and simply use these values directly.
--- drivers/media/i2c/ov2680.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/media/i2c/ov2680.c +2 -6
@@ -140,8 +140,6 @@ struct ov2680_mode {u16 v_end;u16 h_output_size;u16 v_output_size; -u16 hts; -u16 vts; };struct ov2680_dev {
@@ -361,8 +359,6 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor)min (sensor->mode.v_start + height -1 ,OV2680_NATIVE_HEIGHT -1 ); sensor->mode.h_output_size = orig_width; sensor->mode.v_output_size = orig_height; - sensor->mode.hts =OV2680_PIXELS_PER_LINE ; - sensor->mode.vts =OV2680_LINES_PER_FRAME ; }static int ov2680_set_mode (struct ov2680_dev *sensor)
@@ -397,9 +393,9 @@ static int ov2680_set_mode(struct ov2680_dev *sensor)cci_write (sensor->regmap,OV2680_REG_VERTICAL_OUTPUT_SIZE , sensor->mode.v_output_size, &ret);cci_write (sensor->regmap,OV2680_REG_TIMING_HTS , - sensor->mode.hts, &ret); +OV2680_PIXELS_PER_LINE , &ret);cci_write (sensor->regmap,OV2680_REG_TIMING_VTS , - sensor->mode.vts, &ret); +OV2680_LINES_PER_FRAME , &ret);cci_write (sensor->regmap,OV2680_REG_ISP_X_WIN ,0 , &ret);cci_write (sensor->regmap,OV2680_REG_ISP_Y_WIN ,0 , &ret);cci_write (sensor->regmap,OV2680_REG_X_INC , inc, &ret);
Signature · 1 line
2.44.0
PATCH v2 3/5 media: ov2680: Add vblank control
In reply to Hans de GoedeAdd vblank control to allow changing the framerate / higher exposure values.
---
Changes in v2:
- Add error checking to __v4l2_ctrl_modify_range() and __v4l2_ctrl_s_ctrl() calls
--- drivers/media/i2c/ov2680.c | 56 +++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 7 deletions(-)
drivers/media/i2c/ov2680.c +49 -7
@@ -75,6 +75,8 @@#define OV2680_ACTIVE_START_TOP 8#define OV2680_MIN_CROP_WIDTH 2#define OV2680_MIN_CROP_HEIGHT 2 +#define OV2680_MIN_VBLANK 4 +#define OV2680_MAX_VBLANK 0xffff/* Fixed pre-div of 1/2 */ #define OV2680_PLL_PREDIV0 2
@@ -84,7 +86,7 @@/* 66MHz pixel clock: 66MHz / 1704 * 1294 = 30fps */ #define OV2680_PIXELS_PER_LINE 1704 -#define OV2680_LINES_PER_FRAME 1294 +#define OV2680_LINES_PER_FRAME_30FPS 1294/* Max exposure time is VTS - 8 */ #define OV2680_INTEGRATION_TIME_MARGIN 8
@@ -127,6 +129,7 @@ struct ov2680_ctrls {struct v4l2_ctrl *test_pattern;struct v4l2_ctrl *link_freq;struct v4l2_ctrl *pixel_rate; +struct v4l2_ctrl *vblank; };struct ov2680_mode {
@@ -394,8 +397,7 @@ static int ov2680_set_mode(struct ov2680_dev *sensor) sensor->mode.v_output_size, &ret);cci_write (sensor->regmap,OV2680_REG_TIMING_HTS ,OV2680_PIXELS_PER_LINE , &ret); -cci_write (sensor->regmap,OV2680_REG_TIMING_VTS , -OV2680_LINES_PER_FRAME , &ret); +/* VTS gets set by the vblank ctrl */ cci_write (sensor->regmap,OV2680_REG_ISP_X_WIN ,0 , &ret);cci_write (sensor->regmap,OV2680_REG_ISP_Y_WIN ,0 , &ret);cci_write (sensor->regmap,OV2680_REG_X_INC , inc, &ret);
@@ -469,6 +471,15 @@ static int ov2680_exposure_set(struct ov2680_dev *sensor, u32 exp) NULL); } +static int ov2680_exposure_update_range (struct ov2680_dev *sensor) +{ +int exp_max = sensor->mode.fmt.height + sensor->ctrls.vblank->val - +OV2680_INTEGRATION_TIME_MARGIN ; + +return __v4l2_ctrl_modify_range (sensor->ctrls.exposure,0 , exp_max, +1 , exp_max); +} +static int ov2680_stream_enable (struct ov2680_dev *sensor) {int ret;
@@ -635,7 +646,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,struct v4l2_mbus_framefmt *try_fmt;const struct v4l2_rect *crop;unsigned int width, height; -int ret =0 ; +int def, max, ret =0 ; crop =__ov2680_get_pad_crop (sensor, sd_state, format->pad, format->which);
@@ -664,6 +675,21 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, sensor->mode.fmt = format->format;ov2680_calc_mode (sensor); +/* vblank range is height dependent adjust and reset to default */ + max =OV2680_MAX_VBLANK - height; + def =OV2680_LINES_PER_FRAME_30FPS - height; + ret =__v4l2_ctrl_modify_range (sensor->ctrls.vblank,OV2680_MIN_VBLANK , + max,1 , def); +if (ret) + goto unlock; + + ret =__v4l2_ctrl_s_ctrl (sensor->ctrls.vblank, def); +if (ret) + goto unlock; + +/* exposure range depends on vts which may have changed */ + ret =ov2680_exposure_update_range (sensor); + unlock:mutex_unlock (&sensor->lock);
@@ -833,6 +859,13 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)struct ov2680_dev *sensor =to_ov2680_dev (sd);int ret; +/* Update exposure range on vblank changes */ +if (ctrl->id ==V4L2_CID_VBLANK ) { + ret =ov2680_exposure_update_range (sensor); +if (ret) +return ret; + } +/* Only apply changes to the controls if the device is powered up */ if (!pm_runtime_get_if_in_use (sensor->sd.dev)) {ov2680_set_bayer_order (sensor, &sensor->mode.fmt);
@@ -855,6 +888,10 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_TEST_PATTERN : ret =ov2680_test_pattern_set (sensor, ctrl->val);break ; +case V4L2_CID_VBLANK : + ret =cci_write (sensor->regmap,OV2680_REG_TIMING_VTS , + sensor->mode.fmt.height + ctrl->val,NULL ); +break ;default : ret = -EINVAL ;break ;
@@ -913,8 +950,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)const struct v4l2_ctrl_ops *ops = &ov2680_ctrl_ops;struct ov2680_ctrls *ctrls = &sensor->ctrls;struct v4l2_ctrl_handler *hdl = &ctrls->handler; -int exp_max =OV2680_LINES_PER_FRAME -OV2680_INTEGRATION_TIME_MARGIN ; -int ret =0 ; +int def, max, ret =0 ;v4l2_i2c_subdev_init (&sensor->sd, client, &ov2680_subdev_ops); sensor->sd.internal_ops = &ov2680_internal_ops;
@@ -939,8 +975,9 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)ARRAY_SIZE (test_pattern_menu) -1 , 0, 0, test_pattern_menu); + max =OV2680_LINES_PER_FRAME_30FPS -OV2680_INTEGRATION_TIME_MARGIN ; ctrls->exposure =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_EXPOSURE , -0 , exp_max,1 , exp_max); +0 , max,1 , max); ctrls->gain =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_ANALOGUE_GAIN ,0 ,1023 ,1 ,250 );
@@ -951,6 +988,11 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)0 , sensor->pixel_rate, 1, sensor->pixel_rate); + max =OV2680_MAX_VBLANK -OV2680_DEFAULT_HEIGHT ; + def =OV2680_LINES_PER_FRAME_30FPS -OV2680_DEFAULT_HEIGHT ; + ctrls->vblank =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_VBLANK , +OV2680_MIN_VBLANK , max,1 , def); +if (hdl->error) { ret = hdl->error; goto cleanup_entity;
Signature · 1 line
2.44.0
PATCH v2 4/5 media: ov2680: Add hblank control
In reply to Hans de GoedeAdd hblank control so that the sensor has all the mandatory controls for libcamera.
---
Changes in v2:
- Add error checking to __v4l2_ctrl_modify_range() and set read-only flag after checking hdl->error
--- drivers/media/i2c/ov2680.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/media/i2c/ov2680.c +12 -0
@@ -130,6 +130,7 @@ struct ov2680_ctrls {struct v4l2_ctrl *link_freq;struct v4l2_ctrl *pixel_rate;struct v4l2_ctrl *vblank; +struct v4l2_ctrl *hblank; };struct ov2680_mode {
@@ -689,6 +690,12 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,/* exposure range depends on vts which may have changed */ ret =ov2680_exposure_update_range (sensor); +if (ret) + goto unlock; + +/* adjust hblank value for new width */ + def =OV2680_PIXELS_PER_LINE - width; + ret =__v4l2_ctrl_modify_range (sensor->ctrls.hblank, def, def,1 , def); unlock:mutex_unlock (&sensor->lock);
@@ -993,6 +1000,10 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) ctrls->vblank =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_VBLANK ,OV2680_MIN_VBLANK , max,1 , def); + def =OV2680_PIXELS_PER_LINE -OV2680_DEFAULT_WIDTH ; + ctrls->hblank =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_HBLANK , + def, def,1 , def); +if (hdl->error) { ret = hdl->error; goto cleanup_entity;
@@ -1001,6 +1012,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) ctrls->vflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; ctrls->hflip->flags |=V4L2_CTRL_FLAG_MODIFY_LAYOUT ; ctrls->link_freq->flags |=V4L2_CTRL_FLAG_READ_ONLY ; + ctrls->hblank->flags |=V4L2_CTRL_FLAG_READ_ONLY ; sensor->sd.ctrl_handler = hdl;
Signature · 1 line
2.44.0
PATCH v2 5/5 media: ov2680: Add camera orientation and sensor rotation controls
In reply to Hans de GoedeAdd camera orientation and sensor rotation controls using the v4l2_fwnode_device_parse() and v4l2_ctrl_new_fwnode_properties() helpers.
---
Changes in v2:
-Use hdl->error to error check v4l2_ctrl_new_fwnode_properties()
--- drivers/media/i2c/ov2680.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/media/i2c/ov2680.c +7 -0
@@ -957,6 +957,7 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor)const struct v4l2_ctrl_ops *ops = &ov2680_ctrl_ops;struct ov2680_ctrls *ctrls = &sensor->ctrls;struct v4l2_ctrl_handler *hdl = &ctrls->handler; +struct v4l2_fwnode_device_properties props;int def, max, ret =0 ;v4l2_i2c_subdev_init (&sensor->sd, client, &ov2680_subdev_ops);
@@ -1004,6 +1005,12 @@ static int ov2680_v4l2_register(struct ov2680_dev *sensor) ctrls->hblank =v4l2_ctrl_new_std (hdl, ops,V4L2_CID_HBLANK , def, def,1 , def); + ret =v4l2_fwnode_device_parse (sensor->dev, &props); +if (ret) + goto cleanup_entity; + +v4l2_ctrl_new_fwnode_properties (hdl, ops, &props); +if (hdl->error) { ret = hdl->error; goto cleanup_entity;
Signature · 1 line
2.44.0