shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rk-isp10: get correct isp out width/height

Browse Source 
Change-Id: I7d5b9fae16c56ebe108673ba46faa10d9a962b10
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
This commit is contained in:
Hu Kejun
2018-07-16 11:12:28 +08:00
committed by Tao Huang
parent 12a0f8c529
commit 6ac96e1bec
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/rk-isp10/cif_isp10.c
View File

@@ -5843,6 +5843,9 @@ int cif_isp10_init(
dev->config.isp_config.si_enable = false;
dev->config.isp_config.ie_config.effect =
CIF_ISP10_IE_NONE;
memset(&dev->config.isp_config.output, 0,
sizeof(dev->config.isp_config.output));
}
if (stream_ids & CIF_ISP10_STREAM_SP)

15
drivers/media/platform/rk-isp10/cif_isp10_v4l2.c
View File

@@ -1333,6 +1333,8 @@ static long v4l2_default_ioctl(struct file *file, void *fh,
bool valid_prio, unsigned int cmd, void *arg)
{
int ret = -EINVAL;
u32 h_offs;
u32 v_offs;
struct vb2_queue *queue = to_vb2_queue(file);
struct cif_isp10_device *dev = to_cif_isp10_device(queue);
@@ -1369,6 +1371,19 @@ static long v4l2_default_ioctl(struct file *file, void *fh,
dev->config.isp_config.output.width;
p_mode_data->isp_output_height =
dev->config.isp_config.output.height;
if (p_mode_data->isp_output_width == 0 ||
p_mode_data->isp_output_height == 0) {
ret = cif_isp10_calc_isp_cropping(dev,
&p_mode_data->isp_output_width,
&p_mode_data->isp_output_height,
&h_offs,
&v_offs);
if (IS_ERR_VALUE(ret)) {
cif_isp10_pltfrm_pr_err(dev->dev,
"failed to get isp_output data\n");
return ret;
}
}
} else if (cmd == RK_VIDIOC_CAMERA_MODULEINFO) {
struct camera_module_info_s *p_camera_module =
(struct camera_module_info_s *)arg;