From c1df7dec1631ec94d0daa78d019e8827de55421d Mon Sep 17 00:00:00 2001 From: Jacob Chen Date: Tue, 16 Jan 2018 11:06:20 +0800 Subject: [PATCH] media: rk-isp10: grab a copy of userspace headers Change-Id: I75ceb19f0f4c9a420440ae73538f030aaf49fb95 Signed-off-by: Jacob Chen --- drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c | 2 +- drivers/media/platform/rk-isp10/cif_isp10.c | 6 +++--- include/media/rk-isp10-config.h | 2 +- include/media/v4l2-config_rockchip.h | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c b/drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c index ef404b840310..2495de3e8adb 100644 --- a/drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c +++ b/drivers/media/i2c/soc_camera/rockchip/ov_camera_module.c @@ -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; diff --git a/drivers/media/platform/rk-isp10/cif_isp10.c b/drivers/media/platform/rk-isp10/cif_isp10.c index 4b22a66f6a4f..547739556b3e 100644 --- a/drivers/media/platform/rk-isp10/cif_isp10.c +++ b/drivers/media/platform/rk-isp10/cif_isp10.c @@ -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)", diff --git a/include/media/rk-isp10-config.h b/include/media/rk-isp10-config.h index 6cdad63de5d2..e8e65b43f086 100644 --- a/include/media/rk-isp10-config.h +++ b/include/media/rk-isp10-config.h @@ -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 */ diff --git a/include/media/v4l2-config_rockchip.h b/include/media/v4l2-config_rockchip.h index fb668027e4e2..afb5a9bd7023 100644 --- a/include/media/v4l2-config_rockchip.h +++ b/include/media/v4l2-config_rockchip.h @@ -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 {