forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

media: rk-isp10: grab a copy of userspace headers

Browse source 
Change-Id: I75ceb19f0f4c9a420440ae73538f030aaf49fb95
Signed-off-by: Jacob Chen <cc@rock-chips.com>
This commit is contained in:
Jacob Chen 2018-01-16 11:06:20 +08:00 • committed by Tao Huang
commit c1df7dec16
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c
View file

@ -931,7 +931,7 @@ long ov_camera_module_ioctl(struct v4l2_subdev *sd,
ov_timings.fine_integration_time_min;
if (cam_mod->custom.g_exposure_valid_frame)
timings->exposure_valid_frame =
timings->exposure_valid_frame[0] =
cam_mod->custom.g_exposure_valid_frame(cam_mod);
if (cam_mod->exp_config.exp_time)
timings->exp_time = cam_mod->exp_config.exp_time;

6
drivers/media/platform/rk-isp10/cif_isp10.c
View file

@ -1552,12 +1552,12 @@ static int cif_isp10_config_img_src(
if (IS_ERR_VALUE(ret)) {
dev->img_src_exps.exp_valid_frms = 2;
} else {
if ((sensor_mode.exposure_valid_frame < 2) ||
(sensor_mode.exposure_valid_frame > 6))
if ((sensor_mode.exposure_valid_frame[0] < 2) ||
(sensor_mode.exposure_valid_frame[0] > 6))
dev->img_src_exps.exp_valid_frms = 2;
else
dev->img_src_exps.exp_valid_frms =
sensor_mode.exposure_valid_frame;
sensor_mode.exposure_valid_frame[0];
}
cif_isp10_pltfrm_pr_dbg(dev->dev,
"cam_itf: (type: 0x%x, dphy: %d, vc: %d, nb_lanes: %d, bitrate: %d)",

2
include/media/rk-isp10-config.h
View file

@ -155,7 +155,7 @@ struct cifisp_awb_stat {
};
struct cifisp_hist_stat {
unsigned short hist_bins[CIFISP_HIST_BIN_N_MAX];
unsigned int hist_bins[CIFISP_HIST_BIN_N_MAX];
};
/*! BLS mean measured values */

4
include/media/v4l2-config_rockchip.h
View file

@ -43,9 +43,11 @@ struct isp_supplemental_sensor_mode_data {
unsigned int isp_output_height;
unsigned char binning_factor_x; /* horizontal binning factor used */
unsigned char binning_factor_y; /* vertical binning factor used */
unsigned char exposure_valid_frame;
unsigned char exposure_valid_frame[2];
int exp_time;
unsigned short gain;
unsigned short af_onoff;
unsigned int vcm_max_step;
};
struct camera_module_info_s {