github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 13:06:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ov5640: fix exposure regression

Browse Source 
commit dc29a1c187 upstream.

Symptom was black image when capturing HD or 5Mp picture
due to manual exposure set to 1 while it was intended to
set autoexposure to "manual", fix this.

Fixes: bf4a4b518c ("media: ov5640: Don't force the auto exposure state at start time").

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hugues Fruchet 2018-09-11 09:48:17 -04:00 committed by Greg Kroah-Hartman
parent 905fa2f2ff
commit f8248ad512
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/i2c/ov5640.c
View File

@ -960,6 +960,12 @@ static int ov5640_load_regs(struct ov5640_dev *sensor,
return ov5640_set_timings(sensor, mode);
}
static int ov5640_set_autoexposure(struct ov5640_dev *sensor, bool on)
{
return ov5640_mod_reg(sensor, OV5640_REG_AEC_PK_MANUAL,
BIT(0), on ? 0 : BIT(0));
}
/* read exposure, in number of line periods */
static int ov5640_get_exposure(struct ov5640_dev *sensor)
{
@ -1604,7 +1610,7 @@ static int ov5640_set_mode_exposure_calc(struct ov5640_dev *sensor,
*/
static int ov5640_set_mode_direct(struct ov5640_dev *sensor,
const struct ov5640_mode_info *mode,
s32 exposure)
bool auto_exp)
{
int ret;
@ -1621,7 +1627,8 @@ static int ov5640_set_mode_direct(struct ov5640_dev *sensor,
if (ret)
return ret;
return __v4l2_ctrl_s_ctrl(sensor->ctrls.auto_exp, exposure);
return __v4l2_ctrl_s_ctrl(sensor->ctrls.auto_exp, auto_exp ?
V4L2_EXPOSURE_AUTO : V4L2_EXPOSURE_MANUAL);
}
static int ov5640_set_mode(struct ov5640_dev *sensor)
@ -1629,7 +1636,7 @@ static int ov5640_set_mode(struct ov5640_dev *sensor)
const struct ov5640_mode_info *mode = sensor->current_mode;
const struct ov5640_mode_info *orig_mode = sensor->last_mode;
enum ov5640_downsize_mode dn_mode, orig_dn_mode;
s32 exposure;
bool auto_exp = sensor->ctrls.auto_exp->val == V4L2_EXPOSURE_AUTO;
int ret;
dn_mode = mode->dn_mode;
@ -1640,8 +1647,7 @@ static int ov5640_set_mode(struct ov5640_dev *sensor)
if (ret)
return ret;
exposure = sensor->ctrls.auto_exp->val;
ret = ov5640_set_exposure(sensor, V4L2_EXPOSURE_MANUAL);
ret = ov5640_set_autoexposure(sensor, false);
if (ret)
return ret;
@ -1657,7 +1663,7 @@ static int ov5640_set_mode(struct ov5640_dev *sensor)
* change inside subsampling or scaling
* download firmware directly
*/
ret = ov5640_set_mode_direct(sensor, mode, exposure);
ret = ov5640_set_mode_direct(sensor, mode, auto_exp);
}
if (ret < 0)