提交 f568b2e4 编写于 作者: D David Plowman 提交者: Zheng Zengkai

media: i2c: imx290: Fix up exposure calcuations and ranges

raspberrypi inclusion
category: feature
bugzilla: 50432

--------------------------------

Should now correspond exactly to the datasheet.
Signed-off-by: NDavid Plowman <david.plowman@raspberrypi.com>
Signed-off-by: NFang Yafen <yafen@iscas.ac.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 6faaa97b
...@@ -50,7 +50,7 @@ enum imx290_clk_index { ...@@ -50,7 +50,7 @@ enum imx290_clk_index {
#define IMX290_HMAX_MIN_4LANE 2200 /* Min of 2200 pixels = 60fps */ #define IMX290_HMAX_MIN_4LANE 2200 /* Min of 2200 pixels = 60fps */
#define IMX290_HMAX_MAX 0xffff #define IMX290_HMAX_MAX 0xffff
#define IMX290_EXPOSURE_MIN 2 #define IMX290_EXPOSURE_MIN 1
#define IMX290_EXPOSURE_STEP 1 #define IMX290_EXPOSURE_STEP 1
#define IMX290_EXPOSURE_LOW 0x3020 #define IMX290_EXPOSURE_LOW 0x3020
#define IMX290_PGCTRL 0x308c #define IMX290_PGCTRL 0x308c
...@@ -584,7 +584,7 @@ static int imx290_set_gain(struct imx290 *imx290, u32 value) ...@@ -584,7 +584,7 @@ static int imx290_set_gain(struct imx290 *imx290, u32 value)
static int imx290_set_exposure(struct imx290 *imx290, u32 value) static int imx290_set_exposure(struct imx290 *imx290, u32 value)
{ {
u32 exposure = (imx290->current_mode->height + imx290->vblank->val) - u32 exposure = (imx290->current_mode->height + imx290->vblank->val) -
value; value - 1;
int ret; int ret;
ret = imx290_write_buffered_reg(imx290, IMX290_EXPOSURE_LOW, 3, ret = imx290_write_buffered_reg(imx290, IMX290_EXPOSURE_LOW, 3,
...@@ -855,10 +855,10 @@ static int imx290_set_fmt(struct v4l2_subdev *sd, ...@@ -855,10 +855,10 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
} }
if (imx290->exposure) if (imx290->exposure)
__v4l2_ctrl_modify_range(imx290->exposure, __v4l2_ctrl_modify_range(imx290->exposure,
mode->vmax - mode->height, IMX290_EXPOSURE_MIN,
mode->vmax - 4, mode->vmax - 2,
IMX290_EXPOSURE_STEP, IMX290_EXPOSURE_STEP,
mode->vmax - 4); mode->vmax - 2);
} }
*format = fmt->format; *format = fmt->format;
...@@ -1349,9 +1349,9 @@ static int imx290_probe(struct i2c_client *client) ...@@ -1349,9 +1349,9 @@ static int imx290_probe(struct i2c_client *client)
imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops, imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
V4L2_CID_EXPOSURE, V4L2_CID_EXPOSURE,
IMX290_EXPOSURE_MIN, IMX290_EXPOSURE_MIN,
mode->vmax - 4, mode->vmax - 2,
IMX290_EXPOSURE_STEP, IMX290_EXPOSURE_STEP,
mode->vmax - 4); mode->vmax - 2);
imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops, imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
V4L2_CID_HFLIP, 0, 1, 1, 0); V4L2_CID_HFLIP, 0, 1, 1, 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册