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: rockchip: isp: resolution limit for isp21

Browse Source 
Change-Id: I046ac456fad9d4617c8fcc4f228409f59d23281a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-04-13 18:41:44 +08:00
committed by Tao Huang
parent 274e3cb9e1
commit 03b6c6cac7
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -194,6 +194,13 @@ int rkisp_align_sensor_resolution(struct rkisp_device *dev,
h = clamp_t(u32, src_h,
CIF_ISP_INPUT_H_MIN,
CIF_ISP_INPUT_H_MAX_V13);
} else if (dev->isp_ver == ISP_V21) {
w = clamp_t(u32, src_w,
CIF_ISP_INPUT_W_MIN,
CIF_ISP_INPUT_W_MAX_V21);
h = clamp_t(u32, src_h,
CIF_ISP_INPUT_H_MIN,
CIF_ISP_INPUT_H_MAX_V21);
} else {
w = clamp_t(u32, src_w,
CIF_ISP_INPUT_W_MIN,
@@ -1512,6 +1519,9 @@ static int rkisp_isp_sd_get_selection(struct v4l2_subdev *sd,
} else if (dev->isp_ver == ISP_V13) {
max_w = CIF_ISP_INPUT_W_MAX_V13;
max_h = CIF_ISP_INPUT_H_MAX_V13;
} else if (dev->isp_ver == ISP_V21) {
max_w = CIF_ISP_INPUT_W_MAX_V21;
max_h = CIF_ISP_INPUT_H_MAX_V21;
} else {
max_w = CIF_ISP_INPUT_W_MAX;
max_h = CIF_ISP_INPUT_H_MAX;

6
drivers/media/platform/rockchip/isp/rkisp.h
View File

@@ -49,8 +49,10 @@
#define CIF_ISP_INPUT_H_MAX_V12 2448
#define CIF_ISP_INPUT_W_MAX_V13 1920
#define CIF_ISP_INPUT_H_MAX_V13 1080
#define CIF_ISP_INPUT_W_MIN 32
#define CIF_ISP_INPUT_H_MIN 16
#define CIF_ISP_INPUT_W_MAX_V21 4096
#define CIF_ISP_INPUT_H_MAX_V21 2304
#define CIF_ISP_INPUT_W_MIN 208
#define CIF_ISP_INPUT_H_MIN 128
#define CIF_ISP_OUTPUT_W_MAX CIF_ISP_INPUT_W_MAX
#define CIF_ISP_OUTPUT_H_MAX CIF_ISP_INPUT_H_MAX
#define CIF_ISP_OUTPUT_W_MIN CIF_ISP_INPUT_W_MIN